| -rw-r--r-- | Rules.make | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -108,36 +108,38 @@ $(TOPDIR)/mkspecs/default : $(TOPDIR)/scripts/subst : FORCE @( \ echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ ) > $@ || ( rm -f $@; exit 1 ) $(TOPDIR)/scripts/filesubst : FORCE @( \ + echo 's,\$$OPIEDIR/root/,/,g'; \ + echo 's,$(OPIEDIR)/root/,/,g'; \ echo 's,\$$OPIEDIR,$(prefix),g'; \ echo 's,$(OPIEDIR),$(prefix),g'; \ echo 's,\$$QTDIR,$(prefix),g'; \ echo 's,$(QTDIR),$(prefix),g'; \ - echo 's,^root/,/,g'; \ - echo 's,^etc/,$(prefix)/etc/,g'; \ - echo 's,^lib/,$(prefix)/lib/,g'; \ - echo 's,^bin/,$(prefix)/bin/,g'; \ - echo 's,^pics/,$(prefix)/pics/,g'; \ - echo 's,^sounds/,$(prefix)/sounds/,g'; \ - echo 's,^plugins/,$(prefix)/plugins/,g'; \ - echo 's,^apps/,$(prefix)/apps/,g'; \ + echo 's,^\(\./\)*root/,/,g'; \ + echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ + echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ + echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ + echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ + echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ + echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ + echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ ) > $@ || ( rm -f $@; exit 1 ) ## general rules ## define descend $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) endef define makefilegen 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$$,,'\` " | \ head -1 | awk '{print $$3}'` endef |