From d3b96ad7049e9ab23111d78cf21b87c302ba908a Mon Sep 17 00:00:00 2001
From: Martin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>
Date: Tue, 2 Dec 2014 19:51:22 +0100
Subject: update Makefile

---
 HISTORY  |  3 +++
 Makefile | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index 87663b79..f906d705 100644
--- a/HISTORY
+++ b/HISTORY
@@ -33,6 +33,9 @@ VDR Plugin 'skinflatplus' Revision History
 - [update] display replay, in mode only only show small version
 - [update] remove fonts from contrib folder
     they waste to much space, if you need them, grab it from previous version
+- [update] Makefile
+    rename VDRLOGO to SKINFLATPLUS_VDRLOGO
+    new variable SKINFLATPLUS_WIDGETDIR for specify the path to the widgets
 
 2014-10-29: Version 0.4.3
 - [add] option to draw the menu background over the entire height
diff --git a/Makefile b/Makefile
index 10f4d6d5..168e4dbe 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ PLUGIN = skinflatplus
 #   vdrlogo_xubuntu
 #   vdrlogo_xubuntu2
 #   vdrlogo_yavdr
-VDRLOGO = vdrlogo_default
+SKINFLATPLUS_VDRLOGO = vdrlogo_default
 
 #DEFINES += -DDEBUGIMAGELOADTIME
 #DEFINES += -DDEBUGEPGTIME
@@ -42,6 +42,7 @@ PLGCFG  = $(call PKGCFG,plgcfg)
 VDRCONFDIR = $(call PKGCFG,configdir)
 PLGRESDIR = $(call PKGCFG,resdir)/plugins/$(PLUGIN)
 TMPDIR ?= /tmp
+SKINFLATPLUS_WIDGETDIR ?= $(LIBDIR)/$(PLUGIN)/widgets
 
 ### The compiler options:
 export CFLAGS   = $(call PKGCFG,cflags)
@@ -67,8 +68,8 @@ SOFILE = libvdr-$(PLUGIN).so
 
 INCLUDES += $(shell pkg-config --cflags Magick++ freetype2 fontconfig)
 
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVDRLOGO=\"$(VDRLOGO)\"
-DEFINES += -DWIDGETFOLDER='"$(LIBDIR)/$(PLUGIN)/widgets"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVDRLOGO=\"$(SKINFLATPLUS_VDRLOGO)\"
+DEFINES += -DWIDGETFOLDER='"$(SKINFLATPLUS_WIDGETDIR)"'
 
 LIBS += $(shell pkg-config --libs Magick++)
 
@@ -146,8 +147,8 @@ install-configs:
 	cp configs/* $(DESTDIR)$(VDRCONFDIR)/plugins/$(PLUGIN)/configs
 
 install-widgets:
-	mkdir -p $(DESTDIR)$(LIBDIR)/$(PLUGIN)/widgets
-	cp -r widgets/* $(DESTDIR)$(LIBDIR)/$(PLUGIN)/widgets
+	mkdir -p $(DESTDIR)$(SKINFLATPLUS_WIDGETDIR)
+	cp -r widgets/* $(DESTDIR)$(SKINFLATPLUS_WIDGETDIR)
 
 install: install-lib install-i18n install-themes install-icons install-decors install-configs install-widgets
 
-- 
cgit v1.2.3