From patchwork Mon Mar 19 22:17:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Ruppert X-Patchwork-Id: 12936 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1S9ktN-00065N-MU for vdr@linuxtv.org; Mon, 19 Mar 2012 23:17:53 +0100 X-tubIT-Incoming-IP: 188.40.54.133 Received: from qasl.de ([188.40.54.133] helo=mail.qasl.de) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtps [TLSv1:AES256-SHA:256] for id 1S9ktN-0005X4-HY; Mon, 19 Mar 2012 23:17:29 +0100 Received: from ip-109-90-45-92.unitymediagroup.de ([109.90.45.92] helo=tyr.qasl.de) by mail.qasl.de with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.77) (envelope-from ) id 1S9ktM-0005YB-Rv; Mon, 19 Mar 2012 23:17:29 +0100 Date: Mon, 19 Mar 2012 23:17:27 +0100 From: Christian Ruppert To: vdr@linuxtv.org Message-ID: <20120319221727.GB18784@tyr.qasl.de> Mail-Followup-To: vdr@linuxtv.org, Klaus.Schmidinger@tvdr.de MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.3.19.220917 X-PMX-Spam: Gauge=XI, Probability=11%, Report=' LINES_OF_YELLING_3 0.671, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CD 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __HAS_MSGID 0, __LINES_OF_YELLING 0, __MIME_VERSION 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' X-LSpam-Score: 0.4 (/) X-LSpam-Report: No, score=0.4 required=5.0 tests=BAYES_00=-1.9, FAKE_REPLY_C=1.486, RDNS_NONE=0.793 autolearn=no Subject: Re: [vdr] Make.config.template broken in 1.7.24 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2012 22:17:54 -0000 Status: O X-Status: X-Keywords: X-UID: 25944 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 :) 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: