summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY3
-rw-r--r--Make.config.template32
2 files changed, 18 insertions, 17 deletions
diff --git a/HISTORY b/HISTORY
index a44bf546..30e03cb5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7010,7 +7010,7 @@ Video Disk Recorder Revision History
which is higher than any normal table id that is broadcast in the EIT data.
See PLUGINS.html, section "Electronic Program Guide" for more information.
-2012-03-14: Version 1.7.27
+2012-03-20: Version 1.7.27
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Changed the Green button in the "Edit timer" menu from "Once" to "Single"
@@ -7048,3 +7048,4 @@ Video Disk Recorder Revision History
- Added missing channel locking to cEIT.
- Fixed reduced bpp support for DVB subtitles (thanks to Rolf Ahrenberg).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Reverted some improvements to Make.config.template (thanks to Christian Ruppert).
diff --git a/Make.config.template b/Make.config.template
index 6c778c28..d51e20c7 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,15 +6,15 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Make.config.template 2.7 2012/03/11 15:33:54 kls Exp $
+# $Id: Make.config.template 2.8 2012/03/20 11:20:13 kls Exp $
### The C compiler and options:
-CC ?= gcc
-CFLAGS ?= -g -O3 -Wall
+CC = gcc
+CFLAGS = -g -O3 -Wall
-CXX ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
+CXX = g++
+CXXFLAGS = -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
ifdef PLUGIN
CFLAGS += -fPIC
@@ -23,23 +23,23 @@ endif
### The directory environment:
-PREFIX ?= $(DESTDIR)/usr/local
-#DVBDIR ?= /usr/src/v4l-dvb/linux
-MANDIR ?= $(PREFIX)/man
-BINDIR ?= $(PREFIX)/bin
+PREFIX = $(DESTDIR)/usr/local
+#DVBDIR = /usr/src/v4l-dvb/linux
+MANDIR = $(PREFIX)/man
+BINDIR = $(PREFIX)/bin
-LOCDIR ?= ./locale
-PLUGINDIR ?= ./PLUGINS
-PLUGINLIBDIR ?= $(PLUGINDIR)/lib
-VIDEODIR ?= /video
-CONFDIR ?= $(VIDEODIR)
+LOCDIR = ./locale
+PLUGINDIR = ./PLUGINS
+PLUGINLIBDIR = $(PLUGINDIR)/lib
+VIDEODIR = /video
+CONFDIR = $(VIDEODIR)
### The remote control:
-LIRC_DEVICE ?= /var/run/lirc/lircd
+LIRC_DEVICE = /var/run/lirc/lircd
## Define if you want vdr to not run as root
-#VDR_USER ?= vdr
+#VDR_USER = vdr
### You don't need to touch the following: