author | kergoth <kergoth> | 2003-04-24 20:09:08 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-24 20:09:08 (UTC) |
commit | b59b200a00486bc68810317eb7f14c565604a475 (patch) (unidiff) | |
tree | fd65d0fe91cc2be850b34da528ba5606af80913d | |
parent | 6bdab3a554c784efa1553485f99e92542071463e (diff) | |
download | opie-b59b200a00486bc68810317eb7f14c565604a475.zip opie-b59b200a00486bc68810317eb7f14c565604a475.tar.gz opie-b59b200a00486bc68810317eb7f14c565604a475.tar.bz2 |
Correct the etc filesubst path
-rw-r--r-- | Rules.make | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -108,33 +108,33 @@ $(TOPDIR)/mkspecs/default : | |||
108 | $(TOPDIR)/scripts/subst : FORCE | 108 | $(TOPDIR)/scripts/subst : FORCE |
109 | @( \ | 109 | @( \ |
110 | echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ | 110 | echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ |
111 | echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ | 111 | echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ |
112 | echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ | 112 | echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ |
113 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ | 113 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ |
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,$(OPIEDIR),$(prefix),g'; \ |
121 | echo 's,\$$QTDIR,$(prefix),g'; \ | 121 | echo 's,\$$QTDIR,$(prefix),g'; \ |
122 | echo 's,$(QTDIR),$(prefix),g'; \ | 122 | echo 's,$(QTDIR),$(prefix),g'; \ |
123 | echo 's,^root/,/,g'; \ | 123 | echo 's,^root/,/,g'; \ |
124 | echo 's,^etc/,/etc/,g'; \ | 124 | echo 's,^etc/,$(prefix)/etc/,g'; \ |
125 | echo 's,^lib/,$(prefix)/lib/,g'; \ | 125 | echo 's,^lib/,$(prefix)/lib/,g'; \ |
126 | echo 's,^bin/,$(prefix)/bin/,g'; \ | 126 | echo 's,^bin/,$(prefix)/bin/,g'; \ |
127 | echo 's,^pics/,$(prefix)/pics/,g'; \ | 127 | echo 's,^pics/,$(prefix)/pics/,g'; \ |
128 | echo 's,^sounds/,$(prefix)/sounds/,g'; \ | 128 | echo 's,^sounds/,$(prefix)/sounds/,g'; \ |
129 | echo 's,^plugins/,$(prefix)/plugins/,g'; \ | 129 | echo 's,^plugins/,$(prefix)/plugins/,g'; \ |
130 | echo 's,^apps/,$(prefix)/apps/,g'; \ | 130 | echo 's,^apps/,$(prefix)/apps/,g'; \ |
131 | ) > $@ || ( rm -f $@; exit 1 ) | 131 | ) > $@ || ( rm -f $@; exit 1 ) |
132 | 132 | ||
133 | ## general rules ## | 133 | ## general rules ## |
134 | 134 | ||
135 | define descend | 135 | define descend |
136 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) | 136 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |
137 | endef | 137 | endef |
138 | 138 | ||
139 | define makefilegen | 139 | define makefilegen |
140 | 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$$,,'\`" | \ | 140 | 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$$,,'\`" | \ |