From patchwork Mon Apr 5 20:01:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Menzel X-Patchwork-Id: 12804 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.69) (envelope-from ) id 1NysUb-0008V0-P1 for vdr@linuxtv.org; Mon, 05 Apr 2010 22:01:54 +0200 X-tubIT-Incoming-IP: 188.40.100.199 Received: from mail.gw90.de ([188.40.100.199]) by mail.tu-berlin.de (exim-4.69/mailfrontend-d) with esmtps [TLSv1:AES256-SHA:256] for id 1NysUb-0001Bu-13; Mon, 05 Apr 2010 22:01:53 +0200 Received: from f053043190.adsl.alicedsl.de ([78.53.43.190] helo=[192.168.178.21]) by mail.gw90.de with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NysUU-0005Xw-St for vdr@linuxtv.org; Mon, 05 Apr 2010 20:01:47 +0000 From: Paul Menzel To: vdr@linuxtv.org Date: Mon, 05 Apr 2010 22:01:44 +0200 Message-ID: <1270497704.17161.2.camel@mattotaupa> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-tubIT-Score: 0.0 () X-PMX-Version: 5.5.5.374460, Antispam-Engine: 2.7.1.369594, Antispam-Data: 2010.4.5.194825 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' SUPERLONG_LINE 0.05, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, INVALID_MSGID_NO_FQDN 0, TO_NO_NAME 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_VERSION 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_PATH 0, __URI_NO_WWW 0' X-LSpam-Score: -3.2 (---) X-LSpam-Report: No, score=-3.2 required=5.0 tests=AWL=0.433, BAYES_00=-2.599, RCVD_IN_DNSWL_LOW=-1 autolearn=ham Subject: [vdr] [PATCH] Do not override externally defined `INCLUDES`. X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.11 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, 05 Apr 2010 20:01:54 -0000 Status: O X-Status: X-Keywords: X-UID: 22781 In some environments, i. e. when cross building, include files are not located in the standard path like `/usr/includes/freetype2`. Make it possible to provide the correct path without needing to patch `Makefile`. Signed-off-by: Paul Menzel --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 31f05b0..c7af79c 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ MANDIR = $(PREFIX)/share/man BINDIR = $(PREFIX)/bin LOCDIR = ./locale LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig -INCLUDES = -I/usr/include/freetype2 +INCLUDES ?= -I/usr/include/freetype2 PLUGINDIR= ./PLUGINS PLUGINLIBDIR= $(PLUGINDIR)/lib