diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2012-12-23 10:05:22 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-12-23 10:05:22 +0100 |
| commit | b03aa8371cbc8f0e968fb485bec56cf48f8cebb6 (patch) | |
| tree | 87f0b6511f8f83a1924330b3440b265acad5e0e3 /newplugin | |
| parent | e66ef9f695b580def34424a95aa29a70d0f695ab (diff) | |
| download | vdr-b03aa8371cbc8f0e968fb485bec56cf48f8cebb6.tar.gz vdr-b03aa8371cbc8f0e968fb485bec56cf48f8cebb6.tar.bz2 | |
Made LIBDIR and LOCDIR non-overwriteable in plugin Makefiles
Diffstat (limited to 'newplugin')
| -rwxr-xr-x | newplugin | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -12,7 +12,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: newplugin 2.13 2012/12/22 11:54:34 kls Exp $ +# $Id: newplugin 2.14 2012/12/23 10:05:22 kls Exp $ $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n"; @@ -75,9 +75,9 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ ### 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 |