From c6c31d0d6dca95e07294ccb1d5827f91fb6776d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matti=20Lehtim=C3=A4ki?= <matti.lehtimaki@gmail.com>
Date: Sat, 28 Sep 2013 11:04:09 +0200
Subject: Makefile fixes. Update HISTORY.

---
 HISTORY  | 10 ++++++++++
 Makefile |  9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index e04b138..052f3bf 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,16 @@
 VDR Plugin 'epgfixer' Revision History
 --------------------------------------
 
+2013-xx-xx: Version x.x.x
+
+- Makefile fixes. Install example config files automatically.
+- Fix crash in config editing menus if using color buttons when config is empty.
+- Fix SVDRP command REL (thanks to Ville Skyttä).
+- Fix LoadConfigFile() return value on success (thanks to Ville Skyttä).
+- Support for new Makefile of VDR >= 1.7.34.
+- Report an error if PCRE library is not available.
+- Fix replacing at the end of string when using s///. Fix variable name clash.
+
 2012-11-28: Version 0.3.1
 
 - Fix memory leak.
diff --git a/Makefile b/Makefile
index 7fefcbe..9b1b134 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
 
 # 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 --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+CFGDIR = $(call PKGCFG,configdir)
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
@@ -70,7 +71,7 @@ OBJS = $(PLUGIN).o blacklist.o charset.o config.o epgclone.o epghandler.o regexp
 
 ifeq ($(REGEXLIB), pcre)
 LIBS += $(shell pcre-config --libs-posix)
-INCLUDE += $(shell pcre-config --cflags)
+INCLUDES += $(shell pcre-config --cflags)
 DEFINES += -DHAVE_PCREPOSIX
 endif
 
@@ -126,7 +127,11 @@ $(SOFILE): $(OBJS)
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
-install: install-lib install-i18n
+install-conf:
+	@mkdir -p $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)
+	@cp -pn $(PLUGIN)/* $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/
+
+install: install-lib install-i18n install-conf
 
 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-- 
cgit v1.2.3