diff options
| author | jlam <jlam@pkgsrc.org> | 2006-04-04 18:07:16 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-04-04 18:07:16 +0000 |
| commit | 0e75430a3dc4283ccdb6d1bedbfa24108807b549 (patch) | |
| tree | e435816da1a247183864f0fb55a6e930bd8907d3 /x11 | |
| parent | 095afb2bfac350826ba3b5c2cd3ebb0843636582 (diff) | |
| download | pkgsrc-0e75430a3dc4283ccdb6d1bedbfa24108807b549.tar.gz | |
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 (limited to 'x11')
| -rw-r--r-- | x11/gdm/Makefile | 3 | ||||
| -rw-r--r-- | x11/gnome-screensaver/Makefile | 4 | ||||
| -rw-r--r-- | x11/gnome2-control-center/Makefile | 3 | ||||
| -rw-r--r-- | x11/gnopernicus/Makefile | 3 |
4 files changed, 8 insertions, 5 deletions
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 |