diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-04-20 00:03:19 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-04-20 00:03:19 +0000 |
| commit | e3199bd4d60038d10945b0182a834ff9a051eeec (patch) | |
| tree | 8bb957361569c49646d1398eee33d3eb77b25f4e | |
| parent | 97458d0a8ec26c222a79d5869d796751faa63b2a (diff) | |
| download | mtk-20170518-e3199bd4d60038d10945b0182a834ff9a051eeec.zip mtk-20170518-e3199bd4d60038d10945b0182a834ff9a051eeec.tar.gz mtk-20170518-e3199bd4d60038d10945b0182a834ff9a051eeec.tar.bz2 | |
revert some previous changes and add another bugfix
SVN-Revision: 3676
| -rw-r--r-- | openwrt/package/rules.mk | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk index d40d692..8bf769d 100644 --- a/openwrt/package/rules.mk +++ b/openwrt/package/rules.mk @@ -40,8 +40,8 @@ DESCRIPTION:= endef define BuildPackage -$$(eval $$(call Package/Default)) -$$(eval $$(call Package/$(1))) +$(eval $(call Package/Default)) +$(eval $(call Package/$(1))) ifeq ($$(TITLE),) $$(error Package $(1) has no TITLE) @@ -74,21 +74,30 @@ install-targets: $$(INFO_$(1)) endif IDEPEND_$(1):=$$(strip $$(DEPENDS)) -CONTROLINFO_$(1) = \ - echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control; \ - echo "Version: $$(VERSION)" >> $$(IDIR_$(1))/CONTROL/control; \ - echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control; \ - echo "Source: $$(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control; \ - echo "Section: $$(SECTION)" >> $$(IDIR_$(1))/CONTROL/control; \ - echo "Priority: $$(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control; \ - echo "Maintainer: $$(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control; \ - echo "Architecture: $$(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control; \ - echo "Description: $$(TITLE)" >> $$(IDIR_$(1))/CONTROL/control; \ - echo "$$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control; + +DUMPINFO += \ + echo "Package: $(1)"; \ + echo "Version: $(VERSION)"; \ + echo "Depends: $(IDEPEND_$(1))"; \ + echo "Title: $(TITLE)"; \ + echo "$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ + echo; \ + echo "$(URL)"; \ + echo "@@"; + $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared mkdir -p $$(IDIR_$(1))/CONTROL - $$(CONTROLINFO_$(1)) + echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control + echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control + echo "Depends: $(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control + echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control + echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control + echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control + echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control + echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control + echo "Description: $(TITLE)" >> $$(IDIR_$(1))/CONTROL/control + echo "$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control for file in conffiles preinst postinst prerm postrm; do \ [ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \ @@ -105,16 +114,6 @@ $(1)-clean: rm -f $$(IPKG_$(1)) clean: $(1)-clean -DUMPINFO += \ - echo "Package: $(1)"; \ - echo "Version: $$(VERSION)"; \ - echo "Depends: $$(IDEPEND_$(1))"; \ - echo "Title: $$(TITLE)"; \ - echo "$$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ - echo; \ - echo "$$(URL)"; \ - echo "@@"; - PACKAGES += $(1) ifneq ($(__DEFAULT_TARGETS),1) |