pass qmake var down

1 files changed, 5 insertions, 5 deletions

diff --git a/Rules.make b/Rules.make
index c3a9041..567d926 100644
--- a/Rules.make
+++ b/Rules.make
@@ -32,33 +32,33 @@ $(TOPDIR)/stamp-headers :
 	( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
 	( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
 	( cd include/opie &&  ln -sf ../../libsql/*.h .; )
 	( 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 $@))
 
 $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
 
 $(TOPDIR)/mkspecs/default :
 	ln -sf linux-g++ $@
 
 ## general rules ##
 
 define descend
-	$(MAKE) -C $(1) $(2)
+	$(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
 endef
 
 define makefilegen
 	cd $(shell dirname $(1)); $(TOPDIR)/qmake/qmake $(3) -o $(shell basename $(1)) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro
 endef