summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-24 19:54:31 (UTC)
committer kergoth <kergoth>2003-04-24 19:54:31 (UTC)
commit6bdab3a554c784efa1553485f99e92542071463e (patch) (unidiff)
treea16f8b61d9128e0c63edabecb2f8420fec7c1de3
parent03c49504998b425986c8b7dabce7a52959c3910c (diff)
downloadopie-6bdab3a554c784efa1553485f99e92542071463e.zip
opie-6bdab3a554c784efa1553485f99e92542071463e.tar.gz
opie-6bdab3a554c784efa1553485f99e92542071463e.tar.bz2
Handle both expanded and unexpanded OPIEDIR and QTDIR in filesubst
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
1 files changed, 2 insertions, 0 deletions
diff --git a/Rules.make b/Rules.make
index 6c40e54..214b94f 100644
--- a/Rules.make
+++ b/Rules.make
@@ -114,13 +114,15 @@ $(TOPDIR)/scripts/subst : FORCE
114 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ 114 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
115 ) > $@ || ( rm -f $@; exit 1 ) 115 ) > $@ || ( rm -f $@; exit 1 )
116 116
117$(TOPDIR)/scripts/filesubst : FORCE 117$(TOPDIR)/scripts/filesubst : FORCE
118 @( \ 118 @( \
119 echo 's,\$$OPIEDIR,$(prefix),g'; \ 119 echo 's,\$$OPIEDIR,$(prefix),g'; \
120 echo 's,$(OPIEDIR),$(prefix),g'; \
120 echo 's,\$$QTDIR,$(prefix),g'; \ 121 echo 's,\$$QTDIR,$(prefix),g'; \
122 echo 's,$(QTDIR),$(prefix),g'; \
121 echo 's,^root/,/,g'; \ 123 echo 's,^root/,/,g'; \
122 echo 's,^etc/,/etc/,g'; \ 124 echo 's,^etc/,/etc/,g'; \
123 echo 's,^lib/,$(prefix)/lib/,g'; \ 125 echo 's,^lib/,$(prefix)/lib/,g'; \
124 echo 's,^bin/,$(prefix)/bin/,g'; \ 126 echo 's,^bin/,$(prefix)/bin/,g'; \
125 echo 's,^pics/,$(prefix)/pics/,g'; \ 127 echo 's,^pics/,$(prefix)/pics/,g'; \
126 echo 's,^sounds/,$(prefix)/sounds/,g'; \ 128 echo 's,^sounds/,$(prefix)/sounds/,g'; \