diff options
| author | rillig <rillig@pkgsrc.org> | 2006-10-26 20:05:03 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-10-26 20:05:03 +0000 |
| commit | 43f0fe2662463294a8a47c27e89913da73f376f4 (patch) | |
| tree | ec2bf88e429b3ac582fc9d7e12ce72db11989745 | |
| parent | 278aceac3f7b774534189642814bf8eaedac00e9 (diff) | |
| download | pkgsrc-43f0fe2662463294a8a47c27e89913da73f376f4.tar.gz | |
Change INSTALL_MAKE_FLAGS to be _appended_ to MAKE_FLAGS when running
"make install". That way, packages don't have to say:
INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} foo=bar,
instead it suffices to say
INSTALL_MAKE_FLAGS+= foo=bar,
which is also more appropriate since multiple files (Makefile,
Makefile.common, options.mk, *.mk) don't need to care about whether
INSTALL_MAKE_FLAGS already includes MAKE_FLAGS or not.
Note: It is no longer possible to override MAKE_FLAGS completely. But
except for some exotic platforms, the default value is empty anyway.
| -rw-r--r-- | mk/install/install.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/install/install.mk b/mk/install/install.mk index 8fdd976df0e..1bfb9635bbd 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.23 2006/10/13 06:32:15 rillig Exp $ +# $NetBSD: install.mk,v 1.24 2006/10/26 20:05:03 rillig Exp $ ###################################################################### ### install (PUBLIC) @@ -274,7 +274,7 @@ install-makedirs: .PHONY: pre-install do-install post-install INSTALL_DIRS?= ${BUILD_DIRS} -INSTALL_MAKE_FLAGS?= ${MAKE_FLAGS} +INSTALL_MAKE_FLAGS?= # none INSTALL_TARGET?= install ${USE_IMAKE:D${NO_INSTALL_MANPAGES:D:Uinstall.man}} .if ${_USE_DESTDIR} != "no" INSTALL_ENV+= DESTDIR=${DESTDIR:Q} @@ -287,7 +287,7 @@ do-install: ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ cd ${WRKSRC} && cd ${_dir_} && \ ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} \ + ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} \ -f ${MAKE_FILE} ${INSTALL_TARGET} . endfor .endif |