From 7fd6bf996bf71d00f52591009b3e5e9c5faf35a6 Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger@gmx.de>
Date: Sun, 4 Apr 2010 13:13:05 +0200
Subject: compile with driver sources different from kernel headers

---
 Makefile         | 4 ++--
 pages/Makefile   | 7 +++++--
 pages/setup.ecpp | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 28c431c..3150941 100644
--- a/Makefile
+++ b/Makefile
@@ -143,10 +143,10 @@ generate-i18n: i18n-template.h $(I18Npot) $(I18Npo) buildutil/pot2i18n.pl
 subdirs: $(SUBDIRS)
 
 $(SUBDIRS):
-	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" $(MAKECMDGOALS)
+	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" VDRDIR="../$(VDRDIR)" $(MAKECMDGOALS)
 
 PAGES:
-	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" .dependencies
+	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" VDRDIR="../$(VDRDIR)" .dependencies
 
 $(VERSIONSUFFIX): FORCE
 	./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX)
diff --git a/pages/Makefile b/pages/Makefile
index 2ab3960..7e0ab56 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -1,8 +1,11 @@
-CXX      ?= g++
+CXX      ?= g++ -v
 AR       ?= ar
 ECPPC    ?= ecppc
 
-INCLUDES += -I.. -I$(VDRDIR)/include
+-include $(VDRDIR)/Make.global
+-include $(VDRDIR)/Make.config
+
+INCLUDES += -I.. -I$(VDRDIR)/include 
 
 ### The directory environment:
 
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index 845e4b7..98bf1eb 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -71,6 +71,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 			LiveSetup().SetShowIMDb(!showIMDb.empty());
 			LiveSetup().SetShowChannelsWithoutEPG(!showChannelsWithoutEPG.empty());
 			LiveSetup().SaveSetup();
+
 			message = tr("Setup saved.");
 		}
 	}
-- 
cgit v1.2.3