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/common.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/common.mk')
| -rw-r--r-- | rules/common.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rules/common.mk b/rules/common.mk index 3ab7f74..fa30a57 100644 --- a/rules/common.mk +++ b/rules/common.mk @@ -18,7 +18,7 @@ # CDDL HEADER END # # -# Copyright (C) 2012, Nexenta Systems, Inc. All rights reserved. +# Copyright (C) 2012, 2013. Nexenta Systems, Inc. All rights reserved. # # include guard: @@ -42,13 +42,11 @@ mach64 := amd64 variants := -workdir-base := work -workdir := $(CURDIR)/$(workdir-base) +topdir := $(CURDIR) +workdir := work sourcedir := $(workdir)/source define add-variant -protodir-base.$1 = $(workdir-base)/proto/$1 -builddir-base.$1 = $(workdir-base)/build/$1 protodir.$1 = $(workdir)/proto/$1 builddir.$1 = $(workdir)/build/$1 |