From e2d396ab55e0fe32606a6b588fcd5ee51a43779b Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Thu, 20 Dec 2012 08:36:09 +0400 Subject: autotools.mk: define make-vars --- README.md | 7 +++++++ rules/autotools.mk | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7930d76..1ebdc22 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,13 @@ programs and terminal database): build-wide-stamp: target = libs install-wide-stamp: target = install.libs +Another target-specific variable is "make-vars". The value of this variable +is appended to make command. By default it is set to `V=1` +for `build-%-stamp` (disable silent rules) and to `DESTDIR="$(protodir)"` for +`install-%-stamp`. You can append or completely replace "make-vars" to +make hacks or when you are using autotools.mk for packages which are not +actually use autotools, but some hand-made configure scripts. + ## ips.mk This module provides functions to work with IPS manifests and publish packages. diff --git a/rules/autotools.mk b/rules/autotools.mk index d2b6349..afdf6e5 100644 --- a/rules/autotools.mk +++ b/rules/autotools.mk @@ -56,13 +56,15 @@ configure-%-stamp: touch $@ build-%-stamp: target = +build-%-stamp: make-vars = V=1 build-%-stamp: - cd "$(builddir)" && $(MAKE) $(make-jobs:%=-j%) $(target) V=1 + cd "$(builddir)" && $(MAKE) $(make-jobs:%=-j%) $(target) $(make-vars) touch $@ install-%-stamp: target = install +install-%-stamp: make-vars = DESTDIR="$(protodir)" install-%-stamp: - cd "$(builddir)" && $(MAKE) $(target) DESTDIR="$(protodir)" + cd "$(builddir)" && $(MAKE) $(target) $(make-vars) touch $@ -- cgit v1.2.3