--- graphlcd/Makefile.orig 2013-01-27 01:50:48.000000000 +0100 +++ graphlcd/Makefile 2013-02-03 16:06:58.516584347 +0100 @@ -17,6 +17,7 @@ ### The directory environment: # Use package data if installed...otherwise assume we're under the VDR source directory: +BASEDIR = $(MLDDIR)/graphlcd-base/src 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) @@ -113,7 +114,8 @@ # some paranoia security checks ifeq ($(LIBDIR),) - $(error LIBDIR not set, bailing out ...) +# $(error LIBDIR not set, bailing out ...) + LIBDIR = ../../lib endif ifeq ($(shell [ $(APIVERSNUM) -ge 10500 ] && echo yes),yes) ifeq ($(LOCDIR),) @@ -170,7 +171,8 @@ ifneq ($(FLAG_PKGCFG),auto) INCLUDES += -I$(TEMP_VDRDIR)/include endif -INCLUDES += -I./graphlcd-base/ -I$(PREFIX)/include +#INCLUDES += -I./graphlcd-base/ -I$(PREFIX)/include +INCLUDES += -I$(BASEDIR)/graphlcd-base/ -I$(VDRDIR)/include -I$(INSTALLPREFIX)/include DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' @@ -257,7 +259,8 @@ ### Targets: $(SOFILE): $(OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lglcddrivers -lglcdgraphics -lglcdskin -lstdc++ -o $@ +# $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lglcddrivers -lglcdgraphics -lglcdskin -lstdc++ -o $@ + $(CXX) $(CXXFLAGS) -L$(INSTALLPREFIX)/lib -L$(BASEDIR)/graphlcd-base/glcddrivers/ -L$(BASEDIR)/graphlcd-base/glcdgraphics/ -L$(BASEDIR)/graphlcd-base/glcdskin/ -shared $(OBJS) -lglcddrivers -lglcdgraphics -lglcdskin -lstdc++ -o $@ install-lib: $(SOFILE) install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)