summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-24 20:09:08 (UTC)
committer kergoth <kergoth>2003-04-24 20:09:08 (UTC)
commitb59b200a00486bc68810317eb7f14c565604a475 (patch) (side-by-side diff)
treefd65d0fe91cc2be850b34da528ba5606af80913d
parent6bdab3a554c784efa1553485f99e92542071463e (diff)
downloadopie-b59b200a00486bc68810317eb7f14c565604a475.zip
opie-b59b200a00486bc68810317eb7f14c565604a475.tar.gz
opie-b59b200a00486bc68810317eb7f14c565604a475.tar.bz2
Correct the etc filesubst path
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rules.make b/Rules.make
index 214b94f..889e9c3 100644
--- a/Rules.make
+++ b/Rules.make
@@ -92,55 +92,55 @@ $(OPIEDIR)/stamp-headers-x11 :
touch $@
$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
@-rm -f $@
@$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
@touch $@
$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake :
$(call descend,$(shell dirname $@),$(shell basename $@))
$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
$(TOPDIR)/mkspecs/default :
ln -sf linux-g++ $@
$(TOPDIR)/scripts/subst : FORCE
@( \
echo 's,\$$QPE_VERSION,$(QPE_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,$(prefix),g'; \
echo 's,$(OPIEDIR),$(prefix),g'; \
echo 's,\$$QTDIR,$(prefix),g'; \
echo 's,$(QTDIR),$(prefix),g'; \
echo 's,^root/,/,g'; \
- echo 's,^etc/,/etc/,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
define makecfg
$(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
endef