summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-11-27 03:33:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-11-27 03:33:19 +0000
commita1ac6d1d9f89278cbd65cbb4b46481e63a29159a (patch)
tree075f50a5182ca6931e68db39d31c7308cae986e7 /include
parent368dc17432eb7c367a892c4b604bdd77b700c487 (diff)
downloadmtk-20170518-a1ac6d1d9f89278cbd65cbb4b46481e63a29159a.zip
mtk-20170518-a1ac6d1d9f89278cbd65cbb4b46481e63a29159a.tar.gz
mtk-20170518-a1ac6d1d9f89278cbd65cbb4b46481e63a29159a.tar.bz2
fix collecting package metadata on freebsd
SVN-Revision: 5655
Diffstat (limited to 'include')
-rw-r--r--include/package.mk34
1 files changed, 20 insertions, 14 deletions
diff --git a/include/package.mk b/include/package.mk
index 6960646..648bda8 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -143,31 +143,35 @@ define BuildPackage
IDEPEND_$(1):=$$(strip $$(DEPENDS))
ifneq ($(DUMP),)
- DUMPINFO += \
+ dumpinfo: dumpinfo-$(1)
+ dumpinfo-$(1): FORCE
+ @$$(DUMPINFO_$(call shvar,$(1)))
+
+ DUMPINFO_$(call shvar,$(1)) += \
echo "Package: $(1)";
ifneq ($(MENU),)
- DUMPINFO += \
+ DUMPINFO_$(call shvar,$(1)) += \
echo "Menu: $(MENU)";
endif
ifneq ($(SUBMENU),)
- DUMPINFO += \
+ DUMPINFO_$(call shvar,$(1)) += \
echo "Submenu: $(SUBMENU)";
ifneq ($(SUBMENUDEP),)
- DUMPINFO += \
+ DUMPINFO_$(call shvar,$(1)) += \
echo "Submenu-Depends: $(SUBMENUDEP)";
endif
endif
ifneq ($(DEFAULT),)
- DUMPINFO += \
+ DUMPINFO_$(call shvar,$(1)) += \
echo "Default: $(DEFAULT)";
endif
$(call shexport,Package/$(1)/description)
- DUMPINFO += \
+ DUMPINFO_$(call shvar,$(1)) += \
if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \
echo "Version: $(VERSION)"; \
echo "Depends: $$(IDEPEND_$(1))"; \
@@ -179,22 +183,25 @@ define BuildPackage
echo -n "Description: "; \
getvar $(call shvar,Package/$(1)/description); \
else \
- echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
+ echo "Description: $(patsubst \\,\\\\,$(DESCRIPTION))" | perl -ne 's/\\/\n/g, print'; \
fi;
ifneq ($(URL),)
- DUMPINFO += \
+ DUMPINFO_$(call shvar,$(1)) += \
echo; \
echo "$(URL)";
endif
- DUMPINFO += \
+ DUMPINFO_$(call shvar,$(1)) += \
echo "@@";
$(call shexport,Package/$(1)/config)
- DUMPINFO += \
- if isset $(call shvar,Package/$(1)/config); then echo "Config: "; getvar $(call shvar,Package/$(1)/config); fi; \
- echo "@@";
+ DUMPINFO_$(call shvar,$(1)) += \
+ if isset $(call shvar,Package/$(1)/config); then \
+ echo "Config: "; \
+ getvar $(call shvar,Package/$(1)/config); \
+ echo "@@"; \
+ fi;
endif
@@ -331,8 +338,7 @@ define Build/Compile
endef
ifneq ($(DUMP),)
- dumpinfo: FORCE
- @$(DUMPINFO)
+ dumpinfo:
else
$(PACKAGE_DIR):
mkdir -p $@