From 80bcd36324f130b3462949a58ce1389984e04376 Mon Sep 17 00:00:00 2001 From: Antti Ajanki Date: Tue, 14 Sep 2010 21:01:03 +0300 Subject: include Make.global --- HISTORY | 5 +++-- src/vdr-plugin/Makefile | 1 + 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"): -- cgit v1.2.3