author | kergoth <kergoth> | 2003-04-25 02:48:29 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-25 02:48:29 (UTC) |
commit | 74e4f59c2177ef9820183edc781fbf098ff88863 (patch) (unidiff) | |
tree | 2c5c5f28d3c6be0b05b4564e2b6ac6539709c533 | |
parent | 6e26252ef78b1d8f6b4c1da404730f7cb6ca25e2 (diff) | |
download | opie-74e4f59c2177ef9820183edc781fbf098ff88863.zip opie-74e4f59c2177ef9820183edc781fbf098ff88863.tar.gz opie-74e4f59c2177ef9820183edc781fbf098ff88863.tar.bz2 |
Here we go again.
-rw-r--r-- | Rules.make | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -114,24 +114,26 @@ $(TOPDIR)/scripts/subst : FORCE | |||
114 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ | 114 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ |
115 | echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ | 115 | echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ |
116 | ) > $@ || ( rm -f $@; exit 1 ) | 116 | ) > $@ || ( rm -f $@; exit 1 ) |
117 | 117 | ||
118 | $(TOPDIR)/scripts/filesubst : FORCE | 118 | $(TOPDIR)/scripts/filesubst : FORCE |
119 | @( \ | 119 | @( \ |
120 | echo 's,\$$OPIEDIR/root/,/,g'; \ | ||
121 | echo 's,$(OPIEDIR)/root/,/,g'; \ | ||
120 | echo 's,\$$OPIEDIR,$(prefix),g'; \ | 122 | echo 's,\$$OPIEDIR,$(prefix),g'; \ |
121 | echo 's,$(OPIEDIR),$(prefix),g'; \ | 123 | echo 's,$(OPIEDIR),$(prefix),g'; \ |
122 | echo 's,\$$QTDIR,$(prefix),g'; \ | 124 | echo 's,\$$QTDIR,$(prefix),g'; \ |
123 | echo 's,$(QTDIR),$(prefix),g'; \ | 125 | echo 's,$(QTDIR),$(prefix),g'; \ |
124 | echo 's,^root/,/,g'; \ | 126 | echo 's,^\(\./\)*root/,/,g'; \ |
125 | echo 's,^etc/,$(prefix)/etc/,g'; \ | 127 | echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ |
126 | echo 's,^lib/,$(prefix)/lib/,g'; \ | 128 | echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ |
127 | echo 's,^bin/,$(prefix)/bin/,g'; \ | 129 | echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ |
128 | echo 's,^pics/,$(prefix)/pics/,g'; \ | 130 | echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ |
129 | echo 's,^sounds/,$(prefix)/sounds/,g'; \ | 131 | echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ |
130 | echo 's,^plugins/,$(prefix)/plugins/,g'; \ | 132 | echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ |
131 | echo 's,^apps/,$(prefix)/apps/,g'; \ | 133 | echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ |
132 | ) > $@ || ( rm -f $@; exit 1 ) | 134 | ) > $@ || ( rm -f $@; exit 1 ) |
133 | 135 | ||
134 | ## general rules ## | 136 | ## general rules ## |
135 | 137 | ||
136 | define descend | 138 | define descend |
137 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) | 139 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |