From 983dc15ba8f877d94d8e2b8c777deb8199f4ec99 Mon Sep 17 00:00:00 2001 From: erwin Date: Fri, 4 Aug 2006 12:34:50 +0000 Subject: Add support for DESTDIR part I. This commit should largele be a NOOP as it only adds support for DESTDIR undefined. This does allow us to start testing ports with DESTDIR set, but this is as of yet not supported. Although this has been extensively tested on pointyhat, this is a very intrusive change and some cases may have been overlooked. Please contact Gabor and me if you find any. PR: 100555 Submitted by: gabor Sponsored by: Google Summer of Code 2006 --- Mk/bsd.gnome.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Mk/bsd.gnome.mk') diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 107656e57e9d..91f95bd0359b 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -106,13 +106,13 @@ gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier GNOME_HTML_DIR?= ${PREFIX}/share/doc GCONF_CONFIG_OPTIONS?= merged GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults -GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY} +GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${TARGETDIR}/${GCONF_CONFIG_DIRECTORY} GNOME_LOCALSTATEDIR?= ${PREFIX}/share/gnome gnomeprefix_CONFIGURE_ENV=GTKDOC="false" -gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \ - --datadir=${PREFIX}/share/gnome \ - --with-html-dir=${GNOME_HTML_DIR} \ - --with-help-dir=${PREFIX}/share/gnome/help \ +gnomeprefix_CONFIGURE_ARGS=--localstatedir=${DESTDIR}${GNOME_LOCALSTATEDIR} \ + --datadir=${TARGETDIR}/share/gnome \ + --with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \ + --with-help-dir=${TARGETDIR}/share/gnome/help \ --disable-gtk-doc \ --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier @@ -725,10 +725,10 @@ post-install: gnome-post-install gnome-pre-su-install: .if defined(_USE_GNOME) && ${_USE_GNOME:Mgnomeprefix}!="" && !defined(NO_MTREE) - @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${PREFIX}/ >/dev/null + @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${TARGETDIR}/ >/dev/null .endif .if defined(GCONF_SCHEMAS) - @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/ + @${MKDIR} ${DESTDIR}${PREFIX}/etc/gconf/gconf.xml.defaults/ .else @${DO_NADA} .endif -- cgit