diff options
| author | Igor Pashev <igor.pashev@nexenta.com> | 2012-11-09 21:47:09 +0400 |
|---|---|---|
| committer | Igor Pashev <igor.pashev@nexenta.com> | 2012-11-09 21:48:03 +0400 |
| commit | 91ffb1070ce375e510e970cf17f7794907f0cc1a (patch) | |
| tree | 5424a9847f6b351f420077c098cf531896cb253e /rules/autotools.mk | |
| parent | f3d91b806b27eea32396148f0667f99a5ca1e8eb (diff) | |
| download | cibs-91ffb1070ce375e510e970cf17f7794907f0cc1a.tar.gz | |
Use variants; avoid implicit rules
Diffstat (limited to 'rules/autotools.mk')
| -rw-r--r-- | rules/autotools.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rules/autotools.mk b/rules/autotools.mk index fd59ff3..bec3042 100644 --- a/rules/autotools.mk +++ b/rules/autotools.mk @@ -34,10 +34,10 @@ configure-env = \ CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ + $(configure-env.$(variant)) \ configure-options = \ - $(configure-options.$(bits)) \ --prefix="$(prefix)" \ --libdir="$(libdir)" \ --bindir="$(bindir)" \ @@ -45,20 +45,21 @@ configure-options = \ --infodir=/usr/share/info \ --mandir=\$${prefix}/share/man \ --localstatedir=/var \ + $(configure-options.$(variant)) \ -configure-%-stamp: pre-configure-stamp +configure-%-stamp: [ -d "$(builddir)" ] || mkdir -p "$(builddir)" cd "$(builddir)" && \ env $(configure-env) \ $(configure) $(configure-options) touch $@ -build-%-stamp: configure-%-stamp +build-%-stamp: cd "$(builddir)" && $(MAKE) $(make-jobs:%=-j%) touch $@ -install-%-stamp: build-%-stamp +install-%-stamp: cd "$(builddir)" && $(MAKE) install DESTDIR="$(protodir)" touch $@ |