author | mickeyl <mickeyl> | 2003-05-03 00:26:55 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-05-03 00:26:55 (UTC) |
commit | 9f766daaab46025af3c455e24c5792b1d95eebb9 (patch) (unidiff) | |
tree | c8d4ffafe6aa2667fe39e6820ea86929ad350f8d | |
parent | 4aaa8efd13ad014280a6f1f05391c1ec464790db (diff) | |
download | opie-9f766daaab46025af3c455e24c5792b1d95eebb9.zip opie-9f766daaab46025af3c455e24c5792b1d95eebb9.tar.gz opie-9f766daaab46025af3c455e24c5792b1d95eebb9.tar.bz2 |
patch to enable putting files in $OPIEDIR/share instead of /share per treke's request
-rw-r--r-- | Rules.make | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -102,48 +102,49 @@ $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconf | |||
102 | 102 | ||
103 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default | 103 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default |
104 | 104 | ||
105 | $(TOPDIR)/mkspecs/default : | 105 | $(TOPDIR)/mkspecs/default : |
106 | ln -sf linux-g++ $@ | 106 | ln -sf linux-g++ $@ |
107 | 107 | ||
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,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ | 111 | echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ |
112 | echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ | 112 | echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ |
113 | echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ | 113 | echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ |
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'; \ | 120 | echo 's,\$$OPIEDIR/root/,/,g'; \ |
121 | echo 's,$(OPIEDIR)/root/,/,g'; \ | 121 | echo 's,$(OPIEDIR)/root/,/,g'; \ |
122 | echo 's,\$$OPIEDIR,$(prefix),g'; \ | 122 | echo 's,\$$OPIEDIR,$(prefix),g'; \ |
123 | echo 's,$(OPIEDIR),$(prefix),g'; \ | 123 | echo 's,$(OPIEDIR),$(prefix),g'; \ |
124 | echo 's,\$$QTDIR,$(prefix),g'; \ | 124 | echo 's,\$$QTDIR,$(prefix),g'; \ |
125 | echo 's,$(QTDIR),$(prefix),g'; \ | 125 | echo 's,$(QTDIR),$(prefix),g'; \ |
126 | echo 's,^\(\./\)*root/,/,g'; \ | 126 | echo 's,^\(\./\)*root/,/,g'; \ |
127 | echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ | 127 | echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ |
128 | echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ | 128 | echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ |
129 | echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ | 129 | echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ |
130 | echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ | 130 | echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ |
131 | echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ | 131 | echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ |
132 | echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ | 132 | echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ |
133 | echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ | 133 | echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ |
134 | echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ | ||
134 | ) > $@ || ( rm -f $@; exit 1 ) | 135 | ) > $@ || ( rm -f $@; exit 1 ) |
135 | 136 | ||
136 | ## general rules ## | 137 | ## general rules ## |
137 | 138 | ||
138 | define descend | 139 | define descend |
139 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) | 140 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |
140 | endef | 141 | endef |
141 | 142 | ||
142 | define makefilegen | 143 | define makefilegen |
143 | 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$$,,'\`" | \ | 144 | 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$$,,'\`" | \ |
144 | head -1 | awk '{print $$3}'` | 145 | head -1 | awk '{print $$3}'` |
145 | endef | 146 | endef |
146 | 147 | ||
147 | define makecfg | 148 | define makecfg |
148 | $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) | 149 | $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) |
149 | endef | 150 | endef |