reverted Makefile changes in parts

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

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 \

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: