summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make6
1 files changed, 4 insertions, 2 deletions
diff --git a/Rules.make b/Rules.make
index e8b2420..f68fa3b 100644
--- a/Rules.make
+++ b/Rules.make
@@ -52,8 +52,11 @@ else
52endif 52endif
53ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) 53ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
54 echo CONFIG += no-override >> $@ 54 echo CONFIG += no-override >> $@
55endif 55endif
56ifeq ($(CONFIG_OPIELOGIN_USEPAM),y)
57 echo CONFIG += OPIELOGIN_USEPAM >> $@
58endif
56ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) 59ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
57 echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ 60 echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
58endif 61endif
59ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) 62ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
@@ -306,10 +309,9 @@ define descend
306 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) 309 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
307endef 310endef
308 311
309define makefilegen 312define makefilegen
310 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \ 313 cd $(if $(1),$(dir $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(notdir $(1))) $(word 3,$(shell grep -m 1 "[[:space:]]$(patsubst %/Makefile,%,$(1))[[:space:]]" $(OPIEDIR)/packages))
311 head -1 | awk '{print $$3}'`
312endef 314endef
313 315
314define makecfg 316define makecfg
315 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) 317 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)