LinuxTV Patchwork Make.config.template broken in 1.7.24

login
register
mail settings
Submitter Christian Ruppert
Date March 19, 2012, 10:17 p.m.
Message ID <20120319221727.GB18784@tyr.qasl.de>
Download mbox | patch
Permalink /patch/12936/
State New
Headers show

Comments

Christian Ruppert - March 19, 2012, 10:17 p.m.
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 :)

Patch

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:
 

Privacy Policy