summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti Ajanki <antti.ajanki@iki.fi>2010-09-14 21:01:03 +0300
committerAntti Ajanki <antti.ajanki@iki.fi>2010-09-14 21:01:03 +0300
commit80bcd36324f130b3462949a58ce1389984e04376 (patch)
treeaa0fef82a4ba65430e17ee2f3d1bc2ca4d8415ac
parent5e0a4cf8e5a55d6dc91af4d5caa4e4292b5079ca (diff)
downloadvdr-plugin-webvideo-80bcd36324f130b3462949a58ce1389984e04376.tar.gz
vdr-plugin-webvideo-80bcd36324f130b3462949a58ce1389984e04376.tar.bz2
include Make.global
-rw-r--r--HISTORY5
-rw-r--r--src/vdr-plugin/Makefile1
2 files changed, 4 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index b56737b..f688f7c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -207,5 +207,6 @@ Video site modules:
- correct template path in webvi.plugin.conf, use user CXXFLAGS,
SYSLIBDIR and DESTDIR in Makefiles, fix typos (patches by Ville
- Skyttä)
-- Command line arguments override config file
+ Skyttä).
+- Command line arguments override config file.
+- Support VDR 1.7 series (Make.global). Untested!
diff --git a/src/vdr-plugin/Makefile b/src/vdr-plugin/Makefile
index ccc5641..04ed962 100644
--- a/src/vdr-plugin/Makefile
+++ b/src/vdr-plugin/Makefile
@@ -32,6 +32,7 @@ LIBS = `xml2-config --libs` -L../libwebvi -lwebvi
### Allow user defined options to overwrite defaults:
+-include $(VDRDIR)/Make.global
-include $(VDRDIR)/Make.config
### The version number of VDR's plugin API (taken from VDR's "config.h"):