summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2015-03-12 17:17:29 +0100
committerlouis <louis.braun@gmx.de>2015-03-12 17:17:29 +0100
commit7b8402030a1c79cb532026a8036e85379511f1e4 (patch)
treeb402b8d2628de92a249958090296a417532b6ac7 /Makefile
parentd000794647981b956ad763ea4069f077f6163bf4 (diff)
downloadvdr-plugin-weatherforecast-0.0.3.tar.gz
vdr-plugin-weatherforecast-0.0.3.tar.bz2
version 0.0.3 - adapted libskindesigner0.0.3
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index fba7ca0..a246bea 100644
--- a/Makefile
+++ b/Makefile
@@ -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_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
LIBDIR = $(call PKGCFG,libdir)
LOCDIR = $(call PKGCFG,locdir)
PLGCFG = $(call PKGCFG,plgcfg)
@@ -59,10 +59,11 @@ LIBS += $(shell pkg-config --cflags --libs jansson)
OBJS = $(PLUGIN).o \
config.o \
setup.o \
- libskindesigner/skindesignerosdbase.o \
- tools/curlfuncs.o \
- tools/jsonhelpers.o \
- tools/filesystem.o \
+ libskindesigner/skindesignerosdbase.o \
+ libskindesigner/osdelements.o \
+ tools/curlfuncs.o \
+ tools/jsonhelpers.o \
+ tools/filesystem.o \
libforecastio/forecastio.o \
libforecastio/forecasts.o \
libforecastio/forecast.o \