From 915029461454cd28ee312948bbe7b4565d2173c0 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Wed, 06 Nov 2002 05:50:05 +0000
Subject: pass qmake var down

---
(limited to 'Rules.make')

diff --git a/Rules.make b/Rules.make
index c3a9041..567d926 100644
--- a/Rules.make
+++ b/Rules.make
@@ -35,14 +35,14 @@ $(TOPDIR)/stamp-headers :
 	( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
 	( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
 	ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
+	ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
 	touch $@
 	
 $(TOPDIR)/library/custom.h : $(TOPDIR)/.config
 	@-rm -f $@
-	$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
-		ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@,\
-		touch $@\
-	)
+	@$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
+		ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
+	@touch $@
 
 $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake :
 	$(call descend,$(shell dirname $@),$(shell basename $@))
@@ -55,7 +55,7 @@ $(TOPDIR)/mkspecs/default :
 ## general rules ##
 
 define descend
-	$(MAKE) -C $(1) $(2)
+	$(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
 endef
 
 define makefilegen
--
cgit v0.9.0.2