summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-02-05 05:20:24 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-02-05 05:20:24 +0800
commit710bd6d2e83f1260ba73eab05bee06979f0a38e8 (patch)
treebc53e0eb46c861108ca220995db79b0b8efb3847
parentb0bf62050675a84d7bf560cdce0d74e0845e7951 (diff)
downloadmarcuscom-ports-710bd6d2e83f1260ba73eab05bee06979f0a38e8.tar
marcuscom-ports-710bd6d2e83f1260ba73eab05bee06979f0a38e8.tar.gz
marcuscom-ports-710bd6d2e83f1260ba73eab05bee06979f0a38e8.tar.bz2
marcuscom-ports-710bd6d2e83f1260ba73eab05bee06979f0a38e8.tar.lz
marcuscom-ports-710bd6d2e83f1260ba73eab05bee06979f0a38e8.tar.xz
marcuscom-ports-710bd6d2e83f1260ba73eab05bee06979f0a38e8.tar.zst
marcuscom-ports-710bd6d2e83f1260ba73eab05bee06979f0a38e8.zip
- s/GNOME_MTREE/GNOME_MTREE_FILE/ to be more like MTREE_FILE
- Allow users to override GNOME_MTREE_FILE (For what ever reason..) git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5619 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--Mk/bsd.gnome.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 0d5e95e24..c8d221b61 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.359 2006/01/31 18:23:55 marcus Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.360 2006/02/04 21:11:43 ahze Exp $
#
# Please view me with 4 column tabs!
@@ -90,8 +90,8 @@ gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in*" -type f | ${XARGS} $
lthack_PRE_PATCH= ${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
'/^LIBTOOL_DEPS="$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltconfig $$LIBTOOL_DEPS;|'
-GNOME_MTREE= ${X11BASE}/etc/mtree/BSD.gnome-x11.dist
-gnomehier_DETECT= ${GNOME_MTREE}
+GNOME_MTREE_FILE?= ${X11BASE}/etc/mtree/BSD.gnome-x11.dist
+gnomehier_DETECT= ${GNOME_MTREE_FILE}
gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
GNOME_HTML_DIR?= ${PREFIX}/share/doc
@@ -728,7 +728,7 @@ 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}/} ${PREFIX}/ >/dev/null
+ @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${PREFIX}/ >/dev/null
.endif
.if defined(GCONF_SCHEMAS)
@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/