[vdr] Make.config.template broken in 1.7.24

Christian Ruppert idl0r at qasl.de
Mon Mar 19 23:17:27 CET 2012


Ok, that was done by mistake :(
Attached is a patch against 1.7.26 which reverts those "?=" back to "=" as in
pre 1.7.24 versions.

Klaus: Please apply that patch for the next release :)

-- 
Regards,
Christian Ruppert
-------------- next part --------------
From 4c26bc2e8b44326ff660a72c3d3cb7a313b4171f Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r at gentoo.org>
Date: Mon, 19 Mar 2012 22:45:06 +0100
Subject: [PATCH] Explicit override variables in Make.config{,.template}

Apparently I "fixed" or rather borked the Make.config by accident in one of my
patches by changing "=" to "?=". That was not intended, at least for the
Make.config{,.template}. So this commits reverts my patch back to the
previous/correct behaviour.

See also: http://article.gmane.org/gmane.linux.vdr/45668
---
 Make.config.template |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Make.config.template b/Make.config.template
index 9b92621..3c565a8 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -10,11 +10,11 @@
 
 ### The C compiler and options:
 
-CC       ?= gcc
-CFLAGS   ?= -g -O3 -Wall
+CC       = gcc
+CFLAGS   = -g -O3 -Wall
 
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXX      = g++
+CXXFLAGS = -g -O3 -Wall -Woverloaded-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:
 
-- 
1.7.3.4

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://www.linuxtv.org/pipermail/vdr/attachments/20120319/0a50303c/attachment.pgp>


More information about the vdr mailing list