diff options
| author | Igor Pashev <igor.pashev@nexenta.com> | 2013-01-30 13:52:21 +0400 |
|---|---|---|
| committer | Igor Pashev <igor.pashev@nexenta.com> | 2013-01-30 13:57:23 +0400 |
| commit | 03f4febe81472ba2829443e9cb8ef418d9e6cc49 (patch) | |
| tree | 93d23cb49667ea5a2ab6247db31badd85e4f3a9b /rules/ips-manifest.mk | |
| parent | c09ff0567d10c12b3b4cfa199bee056ec143483f (diff) | |
| download | cibs-03f4febe81472ba2829443e9cb8ef418d9e6cc49.tar.gz | |
Ensuse that searching in proto dirs has predictable order:
1. Top directory first
2. Variants' proto dirs in order variants are defined
Remove source dir from proto dirs, but add $(sourcedir)
to IPS defines, so one can write:
file $(sourcedir)/README path=/usr/share/doc/foo/README
Diffstat (limited to 'rules/ips-manifest.mk')
| -rw-r--r-- | rules/ips-manifest.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/rules/ips-manifest.mk b/rules/ips-manifest.mk index d2b2907..3bea4be 100644 --- a/rules/ips-manifest.mk +++ b/rules/ips-manifest.mk @@ -49,16 +49,18 @@ pkg-define += \ -D build64="$(build64)" \ # Add $(protodir.<variant>) to use in manifest: -# file $(protodir.64) path=usr/include/header.64.h -pkg-define += $(foreach _,$(variants),-D protodir.$(_)="$(protodir-base.$(_))") +# file $(protodir.64)/usr/include/header.h path=usr/include/header.64.h +pkg-define += $(foreach _,$(variants),-D protodir.$(_)="$(protodir.$(_))") # Same for $(builddir.xxx): -pkg-define += $(foreach _,$(variants),-D builddir.$(_)="$(builddir-base.$(_))") +pkg-define += $(foreach _,$(variants),-D builddir.$(_)="$(builddir.$(_))") + +pkg-define += -D sourcedir="$(sourcedir)" # Where to find files: -pkg-protos = $(protodirs:%=-d "%") +pkg-protos = -d . +pkg-protos += $(protodirs:%=-d "%") pkg-protos += $(foreach _,$(variants),-d "$(protodir.$(_))") -pkg-protos += -d . transformations := \ $(transdir)/defaults \ |