summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-25 02:48:29 (UTC)
committer kergoth <kergoth>2003-04-25 02:48:29 (UTC)
commit74e4f59c2177ef9820183edc781fbf098ff88863 (patch) (side-by-side diff)
tree2c5c5f28d3c6be0b05b4564e2b6ac6539709c533
parent6e26252ef78b1d8f6b4c1da404730f7cb6ca25e2 (diff)
downloadopie-74e4f59c2177ef9820183edc781fbf098ff88863.zip
opie-74e4f59c2177ef9820183edc781fbf098ff88863.tar.gz
opie-74e4f59c2177ef9820183edc781fbf098ff88863.tar.bz2
Here we go again.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make18
1 files changed, 10 insertions, 8 deletions
diff --git a/Rules.make b/Rules.make
index b9eab7e..a3646f8 100644
--- a/Rules.make
+++ b/Rules.make
@@ -114,24 +114,26 @@ $(TOPDIR)/scripts/subst : FORCE
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)