From d7cd7ae95e86736c315e3d5f8b6e414bf17ff533 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Mon, 1 Oct 2012 15:17:39 +0400 Subject: Pass all variable from Makefile to pkgmogrify --- rules/ips.mk | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'rules') diff --git a/rules/ips.mk b/rules/ips.mk index d215af5..4c07710 100644 --- a/rules/ips.mk +++ b/rules/ips.mk @@ -35,18 +35,10 @@ ips-version = $(version) endif # Substitutions in IPS manifest: -# XXX What about to grep all variables from component makefile? -pkg-define = \ --Dsummary="$(summary)" \ --Dlicense="$(license)" \ --Dlicense-file="$(license-file)" \ --Dhome="$(home)" \ --Dname="$(name)" \ --Dversion="$(version)" \ --Dips-version="$(ips-version)" \ --Darchive="$(archive)" \ --Ddownload="$(download)" \ --Dchecksum="$(checksum)" \ +makefile-vars := $(shell sed -n 's/^ *\([0-9a-zA-Z]*\) *[:?]*=.*$$/\1/p' Makefile | sort -u) +pkg-define = $(foreach _,$(makefile-vars),-D$(_)="$($(_))") +pkg-define += -Dips-version="$(ips-version)" + pkg-define += \ -DMACH="$(mach)" \ -- cgit v1.2.3