projects
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e37fde9
)
fix extra control files for packages containing "." and allow different conffiles...
author
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 18 Jun 2006 13:32:43 +0000
(13:32 +0000)
committer
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 18 Jun 2006 13:32:43 +0000
(13:32 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3985
3c298f89
-4303-0410-b956-
a3cf2f4a3e73
package/rules.mk
patch
|
blob
|
history
diff --git
a/package/rules.mk
b/package/rules.mk
index
d7719eb
..
40e07f8
100644
(file)
--- a/
package/rules.mk
+++ b/
package/rules.mk
@@
-78,9
+78,9
@@
define Package/Default
endef
define BuildIPKGVariable
endef
define BuildIPKGVariable
-pkg_$(subst
-,_,$(1
))_$(2) = $$(Package/$(1)/$(2))
-export pkg_$(subst
-,_,$(1))_$(2
)
-
COMMANDS += if [ -n "$$$$$$$$pkg_$(subst -,_,$(1))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst -,_,$(1
))_$(2)" > $(2); fi;
+pkg_$(subst
.,_,$(subst -,_,$(1)
))_$(2) = $$(Package/$(1)/$(2))
+export pkg_$(subst
.,_,$(subst -,_,$(1))_$(2)
)
+
$(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)
))_$(2)" > $(2); fi;
endef
define BuildPackage
endef
define BuildPackage
@@
-175,7
+175,7
@@
define BuildPackage
echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control
chmod 644 $$(IDIR_$(1))/CONTROL/control
(cd $$(IDIR_$(1))/CONTROL; \
echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control
chmod 644 $$(IDIR_$(1))/CONTROL/control
(cd $$(IDIR_$(1))/CONTROL; \
- $(COMMANDS) \
+ $(
$(1)_
COMMANDS) \
)
$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
)
$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built