From 0e75430a3dc4283ccdb6d1bedbfa24108807b549 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 4 Apr 2006 18:07:16 +0000 Subject: 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. --- sysutils/gnome-menus/Makefile | 4 ++-- sysutils/gnome-vfs2/Makefile.common | 3 ++- sysutils/nautilus-cd-burner/Makefile | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'sysutils') 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} -- cgit v1.2.3