aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-11-20 18:00:07 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-11-20 18:00:07 +0400
commit73eda209f52224c6a21731c718474b438439f29c (patch)
tree257637b539ba9a1429b9a043a63b4df4c5c53286
parenta36451f126ff8aadc9de1a456ef3e895a3cc9faa (diff)
downloadcibs-73eda209f52224c6a21731c718474b438439f29c.tar.gz
Fix adding source dir
-rw-r--r--rules/ips-manifest.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/rules/ips-manifest.mk b/rules/ips-manifest.mk
index ea0332c..4184cb5 100644
--- a/rules/ips-manifest.mk
+++ b/rules/ips-manifest.mk
@@ -34,7 +34,7 @@ ips-version = $(version)
# Substitutions in IPS manifest:
makefile-vars := $(shell sed -n 's/^ *\([a-zA-Z][-_0-9a-zA-Z]*\) *[:?]*=.*$$/\1/p' Makefile | sort -u)
-pkg-define = $(foreach _,$(makefile-vars),-D $(_)="$($(_))")
+pkg-define += $(foreach _,$(makefile-vars),-D $(_)="$($(_))")
pkg-define += -D ips-version="$(ips-version)"
@@ -56,7 +56,8 @@ pkg-define += $(foreach _,$(variants),-D protodir.$(_)="$(protodir-base.$(_))")
pkg-define += $(foreach _,$(variants),-D builddir.$(_)="$(builddir-base.$(_))")
# Where to find files:
-pkg-protos = $(foreach _,$(variants),-d "$(protodir.$(_))")
+pkg-protos = $(protodirs:%=-d "%")
+pkg-protos += $(foreach _,$(variants),-d "$(protodir.$(_))")
pkg-protos += -d .
transformations := \