From b2b47657ba8bca7e63e9cee1ea3b825d094ae26f Mon Sep 17 00:00:00 2001 From: phintuka Date: Fri, 19 Jan 2007 12:09:21 +0000 Subject: =?UTF-8?q?Use=20separate=20VDRINCDIR=20to=20allow=20overriding=20?= =?UTF-8?q?location=20of=20VDR=20headers=20Exclude=20CVS=20directories=20f?= =?UTF-8?q?rom=20distribution=20package=20(Patch=20from=20Ville=20Skytt?= =?UTF-8?q?=C3=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cb9d0fd8..0769ee36 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # See the main source file 'xineliboutput.c' for copyright information and # how to reach the author. # -# $Id: Makefile,v 1.19 2007-01-13 11:54:36 phintuka Exp $ +# $Id: Makefile,v 1.20 2007-01-19 12:09:21 phintuka Exp $ # # The official name of this plugin. @@ -84,6 +84,7 @@ DESTDIR ?= / INSTALL ?= install +VDRINCDIR ?= $(VDRDIR)/include ### ### Allow user defined options to overwrite defaults: @@ -179,7 +180,7 @@ endif ### Includes and Defines (add further entries here): ### -INCLUDES += -I$(VDRDIR)/include +INCLUDES += -I$(VDRINCDIR) LIBS_XINE += $(shell xine-config --libs) LIBS_X11 += -L/usr/X11R6/lib -lX11 -lXv -lXext @@ -190,7 +191,7 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' \ -DXINELIBOUTPUT_VERSION='"$(VERSION)"' # check for yaegp patch -DEFINES += $(shell grep 'vidWin' \$(VDRDIR)/osd.h >& /dev/null && echo "-DYAEGP_PATCH") +DEFINES += $(shell grep 'vidWin' \$(VDRINCDIR)/vdr/osd.h >& /dev/null && echo "-DYAEGP_PATCH") ifeq ($(XINELIBOUTPUT_XINEPLUGIN), 1) CFLAGS += $(shell xine-config --cflags) @@ -427,7 +428,7 @@ dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) @mkdir $(TMPDIR)/$(ARCHIVE) @cp -a * $(TMPDIR)/$(ARCHIVE) - @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) + @tar czf $(PACKAGE).tgz --exclude=CVS -C $(TMPDIR) $(ARCHIVE) @-rm -rf $(TMPDIR)/$(ARCHIVE) @echo Distribution package created as $(PACKAGE).tgz -- cgit v1.2.3