summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2015-04-04 17:42:23 +0200
committerlouis <louis.braun@gmx.de>2015-04-04 17:42:23 +0200
commitacebd3c275fccf7bb0b4f6ac9feb948617fb3a9b (patch)
treec1eaffe2be8bf58803cf76c79be45474a3927537
parente9f8d708cf3d9f765b2d4210b78f245aede19b53 (diff)
downloadvdr-plugin-skindesigner-acebd3c275fccf7bb0b4f6ac9feb948617fb3a9b.tar.gz
vdr-plugin-skindesigner-acebd3c275fccf7bb0b4f6ac9feb948617fb3a9b.tar.bz2
reverted Makefile changes in parts
-rw-r--r--HISTORY2
-rw-r--r--Makefile21
-rw-r--r--libskindesignerapi/Makefile2
3 files changed, 6 insertions, 19 deletions
diff --git a/HISTORY b/HISTORY
index a1ad8ef..6701c7f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -274,3 +274,5 @@ Version 0.4.0
- fixed bug in metrixhd timers menu
- fixed bug that datetime was not correctly drawn if a submenu implements
its own datetime display
+- adapted Makefiles to work also in a LCLBLD environment
+- reverted Makefile changes in parts
diff --git a/Makefile b/Makefile
index cc7a77c..f7cec16 100644
--- a/Makefile
+++ b/Makefile
@@ -54,24 +54,9 @@ LIBS += $(shell pkg-config --libs librsvg-2.0 cairo-png) -ljpeg
LIBS += $(shell xml2-config --libs)
-INCLUDESLIBSD = $(shell pkg-config --silence-errors --cflags libskindesignerapi)
-ifeq ($(strip $(INCLUDESLIBSD)),)
- INCLUDESLIBSD = $(shell pkg-config --cflags ./libskindesignerapi/libskindesignerapi.pc)
-endif
-
-LIBSLIBSD = $(shell pkg-config --silence-errors --libs libskindesignerapi)
-ifeq ($(strip $(LIBSLIBSD)),)
- LIBSLIBSD = $(shell pkg-config --libs ./libskindesignerapi/libskindesignerapi.pc)
-endif
-
-LIBSDVERSION = $(shell pkg-config --silence-errors --modversion libskindesignerapi)
-ifeq ($(strip $(LIBSDVERSION)),)
- LIBSDVERSION = $(shell pkg-config --modversion ./libskindesignerapi/libskindesignerapi.pc)
-endif
-
-INCLUDES += $(INCLUDESLIBSD)
-LIBS += $(LIBSLIBSD)
-DEFINES += -DLIBSKINDESIGNERAPIVERSION='"$(LIBSDVERSION)"'
+INCLUDES += $(shell pkg-config --cflags libskindesignerapi)
+LIBS += $(shell pkg-config --libs libskindesignerapi)
+DEFINES += -DLIBSKINDESIGNERAPIVERSION='"$(shell pkg-config --modversion libskindesignerapi)"'
### The object files:
OBJS = $(PLUGIN).o \
diff --git a/libskindesignerapi/Makefile b/libskindesignerapi/Makefile
index fa1ce56..7c24db8 100644
--- a/libskindesignerapi/Makefile
+++ b/libskindesignerapi/Makefile
@@ -12,7 +12,7 @@ TARGET_LIB = $(SONAME).$(MINOR)
PREFIX ?= /usr/local
INCDIR ?= $(PREFIX)/include
LIBDIR ?= $(PREFIX)/lib
-PCDIR ?= $(PREFIX)/lib/pkgconfig
+PCDIR ?= $(shell pkg-config --variable pc_path pkg-config |cut -d ':' -f1)
TMPDIR ?= /tmp
### The name of the distribution archive: