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/autotools.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/autotools.mk')
| -rw-r--r-- | rules/autotools.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/autotools.mk b/rules/autotools.mk index 0e51401..d9b76b6 100644 --- a/rules/autotools.mk +++ b/rules/autotools.mk @@ -27,7 +27,7 @@ ifeq (,$(__autotools_mk)) include $(cibs-root)/rules/common.mk -configure := $(sourcedir)/configure +configure := $(topdir)/$(sourcedir)/configure configure-env = \ CC="$(CC)" \ CXX="$(CXX)" \ @@ -62,7 +62,7 @@ build-%-stamp: touch $@ install-%-stamp: target = install -install-%-stamp: make-vars = DESTDIR="$(protodir)" +install-%-stamp: make-vars = DESTDIR="$(topdir)/$(protodir)" install-%-stamp: cd "$(builddir)" && $(MAKE) $(target) $(make-vars) touch $@ |