From b03aa8371cbc8f0e968fb485bec56cf48f8cebb6 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 23 Dec 2012 10:05:22 +0100 Subject: Made LIBDIR and LOCDIR non-overwriteable in plugin Makefiles --- PLUGINS/src/pictures/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'PLUGINS/src/pictures/Makefile') diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile index ed5bdb92..516cb857 100644 --- a/PLUGINS/src/pictures/Makefile +++ b/PLUGINS/src/pictures/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 2.14 2012/12/22 11:51:44 kls Exp $ +# $Id: Makefile 2.15 2012/12/23 10:04:13 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -16,9 +16,9 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The directory environment: # Use package data if installed...otherwise assume we're under the VDR source directory: -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR ?= $(DESTDIR)$(call PKGCFG,libdir) -LOCDIR ?= $(DESTDIR)$(call PKGCFG,locdir) +PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) +LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LOCDIR = $(DESTDIR)$(call PKGCFG,locdir) # TMPDIR ?= /tmp -- cgit v1.2.3