INSTALL_MAKE_FLAGS doesn't append to MAKE_FLAGS, it replaces it. Make

sure that we preserve any other MAKE_FLAGS when setting INSTALL_MAKE_FLAGS.

14 files changed, 30 insertions, 22 deletions

diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index e1a3866cc1a..c73637a8a73 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/04/03 15:45:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=	gossip-0.10.2
@@ -26,7 +26,7 @@ GCONF2_SCHEMAS=		gossip.schemas
 EGDIR=			${PREFIX}/share/examples/gossip
 CONF_FILES=		${EGDIR}/sound/events/gossip.soundlist \
 			${PKG_SYSCONFDIR}/sound/events/gossip.soundlist
-INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
 .include "../../chat/loudmouth/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 90b803f89e3..4d09bec84ca 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/04/01 14:36:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.53 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=	libgnome-2.14.0
@@ -26,6 +26,7 @@ CONFIGURE_ARGS= 	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	soundlistdir=${PREFIX}/share/examples/libgnome/sound/events
 
 OWN_DIRS=	${PKG_SYSCONFDIR}/sound/events
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index cdfe0e4e02b..a792bb90dbc 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/02 10:41:41 martti Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/04 18:07:16 jlam Exp $
 
 PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
 PKGREVISION=		1
@@ -11,7 +11,7 @@ CONFIGURE_ARGS+=	--disable-gui
 
 INSTALL_TARGET=		installruntime installmacros installtutor installtools
 USE_TOOLS+=		awk
-INSTALL_MAKE_FLAGS+=	TOOLS_AWK=${TOOLS_AWK:Q}
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK:Q}
 
 PLIST_SUBST+=		VIM_SUBDIR=${VIM_SUBDIR:Q}
 
diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index 859f3c29f81..62a9e27e762 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/29 06:21:40 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=		vmips-1.3.1
@@ -12,7 +12,7 @@ COMMENT=		MIPS R3000 emulator
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 INSTALLATION_DIRS=	bin include/vmips man/man1 share/vmips share/examples/vmips
-INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR:Q}
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 
 EGDIR=			${PREFIX}/share/examples/vmips
 CONF_FILES=		${EGDIR}/vmipsrc ${PKG_SYSCONFDIR}/vmipsrc
diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index ae3c23ed796..fd80b75462a 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/04 14:45:44 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=	barcode-0.98
@@ -13,7 +13,8 @@ GNU_CONFIGURE=	YES
 MAKE_ENV+=	AWK=${AWK:Q}
 INFO_FILES=	# PLIST
 
-INSTALL_MAKE_FLAGS=	INFODIR=${PREFIX:Q}/${PKGINFODIR:Q}		\
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS}					\
+			INFODIR=${PREFIX:Q}/${PKGINFODIR:Q}		\
 			MAN1DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man1		\
 			MAN3DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man3
 
diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index 8543173f9ff..34dd394c6a9 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/04/04 14:45:45 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/04 18:07:16 jlam Exp $
 
 DISTNAME=		gri-2.12.5
 PKGREVISION=	3
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake gs:run makeinfo perl
 REPLACE_PERL+=		gri_merge gri_unpage
 INFO_FILES=		# PLIST
-INSTALL_MAKE_FLAGS=	INFO_DIR=${PREFIX:Q}/${PKGINFODIR:Q}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} INFO_DIR=${PREFIX:Q}/${PKGINFODIR:Q}
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 3ef19e1eb9e..13e20233fde 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/04/04 17:16:28 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/04 18:07:16 jlam Exp $
 
 DISTNAME=		gforth-0.6.2
 PKGREVISION=		1
@@ -18,7 +18,8 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		EMACS=${PREFIX}/bin/emacs
 CFLAGS+=		-Dunix
 INFO_FILES=		# PLIST
-INSTALL_MAKE_FLAGS=	infodir=${PREFIX:Q}/${PKGINFODIR:Q}		\
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS}					\
+			infodir=${PREFIX:Q}/${PKGINFODIR:Q}		\
 			mandir=${PREFIX:Q}/${PKGMANDIR:Q}
 
 TEST_TARGET=	test
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index 9a72a3b7587..36ebdbcbedf 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/30 21:11:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=	gnome-menus-2.13.5
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--disable-python
 
-INSTALL_MAKE_FLAGS+=	menudir=${EXAMPLEDIR}
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} menudir=${EXAMPLEDIR}
 
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libmenu/libgnome-menu.pc.in
 
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index 7b7117c04fa..7c43f808ead 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2006/03/30 21:07:48 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.31 2006/04/04 18:07:16 jlam Exp $
 #
 
 GNOME_VFS2_VERSION=	2.14.0
@@ -39,6 +39,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	modulesconfdir=${PREFIX}/share/examples/gnome-vfs-2.0/modules
 
 PKG_SYSCONFSUBDIR=	gnome-vfs-2.0
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 8a6e56bd14a..0f531d0fc2c 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/30 21:32:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.14.0.2
@@ -24,6 +24,7 @@ PKGCONFIG_OVERRIDE=	libnautilus-burn.pc.in
 
 CONFIGURE_ARGS+=	--disable-hal
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	modulesconfdir=${PREFIX}/share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules
 INSTALL_MAKE_FLAGS+=	schemadir=${GCONF2_SCHEMAS_DIR}
 
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index bcf4946d429..d971381f7d4 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2006/04/02 09:16:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.105 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=	gdm-2.14.0
@@ -32,6 +32,7 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
 CONFIGURE_ENV+=		X11BASE=${X11BASE:Q}
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	GDM_CUSTOM_CONF=${EGDIR}/gdm/custom.conf
 INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 MAKE_ENV+=		CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index c1bf7bbbd63..662ebed6b82 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/04/01 21:50:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=	gnome-screensaver-2.14.0
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE=	data/gnome-screensaver.pc
 GCONF2_SCHEMAS=		gnome-screensaver.schemas
 
 EGDIR=			${PREFIX}/share/examples/gnome-screensaver
-INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR:Q}
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 MESSAGE_SUBST+=		EGDIR=${EGDIR:Q}
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/xdg/menus
 CONF_FILES=		${EGDIR}/xdg/menus/gnome-screensavers.menu \
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index d501194d0ca..2f56f909e05 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/03/31 18:59:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.62 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=	control-center-2.14.0
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=	--disable-alsa
 CONFIGURE_ARGS+=	--with-gstreamer=0.10
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
 
 GCONF2_SCHEMAS= 	apps_gnome_settings_daemon_default_editor.schemas
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 6a89176eb91..7b395f7a2f2 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/30 21:31:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2006/04/04 18:07:16 jlam Exp $
 #
 
 DISTNAME=		gnopernicus-1.0.3
@@ -30,6 +30,7 @@ CONF_FILES+=		${EGDIR}/translation_tables/es.a2b \
 			${PKG_SYSCONFDIR}/translation_tables/es.a2b
 CONF_FILES+=		${EGDIR}/translation_tables/sv.a2b \
 			${PKG_SYSCONFDIR}/translation_tables/sv.a2b
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	translationdir=${EGDIR}/translation_tables
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnopernicus