From ea613e6b2651bedacce9413df0a9e3c80afb6c1c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Wed, 1 Jan 2014 13:35:13 +0100 Subject: Avoiding unnecessary pkg-config warnings in plugin Makefiles --- PLUGINS/src/dvbsddevice/HISTORY | 1 + PLUGINS/src/dvbsddevice/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'PLUGINS/src/dvbsddevice') diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY index a374dc35..1dcd561b 100644 --- a/PLUGINS/src/dvbsddevice/HISTORY +++ b/PLUGINS/src/dvbsddevice/HISTORY @@ -53,4 +53,5 @@ VDR Plugin 'dvbsddevice' Revision History 2014-01-01: Version 2.1.1 +- Avoiding unnecessary pkg-config warnings in plugin Makefiles. - cDevice::TrickSpeed() now has an additional parameter named Forward. diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile index f7e73b2c..a8647741 100644 --- a/PLUGINS/src/dvbsddevice/Makefile +++ b/PLUGINS/src/dvbsddevice/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.20 2013/01/12 13:45:01 kls Exp $ +# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -16,7 +16,7 @@ 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)) +PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr)) LIBDIR = $(call PKGCFG,libdir) PLGCFG = $(call PKGCFG,plgcfg) # -- cgit v1.2.3