From 0c8864cb3dcbff2c2a824721875ec96e139eb5d8 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 24 Jul 2006 00:57:33 +0000 Subject: Add a new knob, WITHOUT_HACK, for I don't have to hack in bsd.gnome.mk at the every time. Now I can keep it in my make.conf. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6725 df743ca5-7f9a-e211-a948-0013205c9059 --- Mk/bsd.gnome.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 42fa405bf..bbe29c78a 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.398 2006/07/18 16:38:33 ahze Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.399 2006/07/18 17:22:27 ahze Exp $ # # Please view me with 4 column tabs! @@ -116,7 +116,9 @@ gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \ --disable-gtk-doc \ --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier +.if !defined(WITHOUT_HACK) gnomeprefix_PREFIX=${LOCALBASE} +.endif gnometarget_CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -688,6 +690,7 @@ LIB_DEPENDS+= ${${component}_LIB_DEPENDS} RUN_DEPENDS+= ${${component}_RUN_DEPENDS} .endif +.if !defined(WITHOUT_HACK) .if defined(${component}_PREFIX) .if ${.MAKEFLAGS:MPREFIX=*}=="" PREFIX= ${${component}_PREFIX} @@ -697,6 +700,7 @@ PREFIX= ${${component}_PREFIX} USE_XLIB= yes .endif .endif +.endif CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS} CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV} -- cgit