summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2010-03-14 19:14:01 +0100
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2010-03-14 19:14:01 +0100
commit4e0db7c16567f5be8bc381bf17d94600e1351d1b (patch)
treece85871df8aff10e1ce35cd492067bb73b950051
parent7c15abcceba6deda3412001c759ef2064ec9f6ac (diff)
parent4f545210e109d2340aa83f8e0f0da6e491b45b85 (diff)
downloadvdr-plugin-live-4e0db7c16567f5be8bc381bf17d94600e1351d1b.tar.gz
vdr-plugin-live-4e0db7c16567f5be8bc381bf17d94600e1351d1b.tar.bz2
Merge remote branch 'winni/master' into devel
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 71ecae5..28c431c 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,11 @@ VDRDIR ?= ../../..
LIBDIR ?= ../../lib
TMPDIR ?= /tmp
+### Make sure that necessary options are included:
+
+-include $(VDRDIR)/Make.global
+
+
### Allow user defined options to overwrite defaults:
-include $(VDRDIR)/Make.config