[pkgsrc/trunk]: pkgsrc/mk/install Change INSTALL_MAKE_FLAGS to be _appended_ ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/665538b4a003
branches:  trunk
changeset: 520719:665538b4a003
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Oct 26 20:05:03 2006 +0000

description:
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.

diffstat:

 mk/install/install.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r e223650f4fda -r 665538b4a003 mk/install/install.mk
--- a/mk/install/install.mk     Thu Oct 26 19:13:48 2006 +0000
+++ b/mk/install/install.mk     Thu Oct 26 20:05:03 2006 +0000
@@ -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 @@
 .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 @@
        ${_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