[pkgsrc/trunk]: pkgsrc INSTALL_MAKE_FLAGS doesn't append to MAKE_FLAGS, it re...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc INSTALL_MAKE_FLAGS doesn't append to MAKE_FLAGS, it re...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:18:04 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6237f674a67a
branches:  trunk
changeset: 510817:6237f674a67a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Apr 04 18:07:16 2006 +0000

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

diffstat:

 chat/gossip/Makefile                 |  4 ++--
 devel/libgnome/Makefile              |  3 ++-
 editors/vim-share/Makefile           |  4 ++--
 emulators/vmips/Makefile             |  4 ++--
 graphics/barcode/Makefile            |  5 +++--
 graphics/gri/Makefile                |  4 ++--
 lang/gforth/Makefile                 |  5 +++--
 sysutils/gnome-menus/Makefile        |  4 ++--
 sysutils/gnome-vfs2/Makefile.common  |  3 ++-
 sysutils/nautilus-cd-burner/Makefile |  3 ++-
 x11/gdm/Makefile                     |  3 ++-
 x11/gnome-screensaver/Makefile       |  4 ++--
 x11/gnome2-control-center/Makefile   |  3 ++-
 x11/gnopernicus/Makefile             |  3 ++-
 14 files changed, 30 insertions(+), 22 deletions(-)

diffs (248 lines):

diff -r c635da9ad40a -r 6237f674a67a chat/gossip/Makefile
--- a/chat/gossip/Makefile      Tue Apr 04 17:45:08 2006 +0000
+++ b/chat/gossip/Makefile      Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 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 -r c635da9ad40a -r 6237f674a67a devel/libgnome/Makefile
--- a/devel/libgnome/Makefile   Tue Apr 04 17:45:08 2006 +0000
+++ b/devel/libgnome/Makefile   Tue Apr 04 18:07:16 2006 +0000
@@ -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+=       --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 -r c635da9ad40a -r 6237f674a67a editors/vim-share/Makefile
--- a/editors/vim-share/Makefile        Tue Apr 04 17:45:08 2006 +0000
+++ b/editors/vim-share/Makefile        Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 
 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 -r c635da9ad40a -r 6237f674a67a emulators/vmips/Makefile
--- a/emulators/vmips/Makefile  Tue Apr 04 17:45:08 2006 +0000
+++ b/emulators/vmips/Makefile  Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 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 -r c635da9ad40a -r 6237f674a67a graphics/barcode/Makefile
--- a/graphics/barcode/Makefile Tue Apr 04 17:45:08 2006 +0000
+++ b/graphics/barcode/Makefile Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 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 -r c635da9ad40a -r 6237f674a67a graphics/gri/Makefile
--- a/graphics/gri/Makefile     Tue Apr 04 17:45:08 2006 +0000
+++ b/graphics/gri/Makefile     Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 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 -r c635da9ad40a -r 6237f674a67a lang/gforth/Makefile
--- a/lang/gforth/Makefile      Tue Apr 04 17:45:08 2006 +0000
+++ b/lang/gforth/Makefile      Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 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 -r c635da9ad40a -r 6237f674a67a sysutils/gnome-menus/Makefile
--- a/sysutils/gnome-menus/Makefile     Tue Apr 04 17:45:08 2006 +0000
+++ b/sysutils/gnome-menus/Makefile     Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 
 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 -r c635da9ad40a -r 6237f674a67a sysutils/gnome-vfs2/Makefile.common
--- a/sysutils/gnome-vfs2/Makefile.common       Tue Apr 04 17:45:08 2006 +0000
+++ b/sysutils/gnome-vfs2/Makefile.common       Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 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 -r c635da9ad40a -r 6237f674a67a sysutils/nautilus-cd-burner/Makefile
--- a/sysutils/nautilus-cd-burner/Makefile      Tue Apr 04 17:45:08 2006 +0000
+++ b/sysutils/nautilus-cd-burner/Makefile      Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 
 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 -r c635da9ad40a -r 6237f674a67a x11/gdm/Makefile
--- a/x11/gdm/Makefile  Tue Apr 04 17:45:08 2006 +0000
+++ b/x11/gdm/Makefile  Tue Apr 04 18:07:16 2006 +0000
@@ -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+=       --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 -r c635da9ad40a -r 6237f674a67a x11/gnome-screensaver/Makefile
--- a/x11/gnome-screensaver/Makefile    Tue Apr 04 17:45:08 2006 +0000
+++ b/x11/gnome-screensaver/Makefile    Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
 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 -r c635da9ad40a -r 6237f674a67a x11/gnome2-control-center/Makefile
--- a/x11/gnome2-control-center/Makefile        Tue Apr 04 17:45:08 2006 +0000
+++ b/x11/gnome2-control-center/Makefile        Tue Apr 04 18:07:16 2006 +0000
@@ -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+=       --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 -r c635da9ad40a -r 6237f674a67a x11/gnopernicus/Makefile
--- a/x11/gnopernicus/Makefile  Tue Apr 04 17:45:08 2006 +0000
+++ b/x11/gnopernicus/Makefile  Tue Apr 04 18:07:16 2006 +0000
@@ -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 @@
                        ${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
Prev by Date: [pkgsrc/trunk]: pkgsrc/audio/sox Update to 12.17.9:
Next by Date: [pkgsrc/trunk]: pkgsrc/fonts/fontforge Variable declaration fix; PR-33164
Previous by Thread: [pkgsrc/trunk]: pkgsrc/audio/sox Update to 12.17.9:
Next by Thread: [pkgsrc/trunk]: pkgsrc/fonts/fontforge Variable declaration fix; PR-33164
Indexes:
Home | Main Index | Thread Index | Old Index