From b6d6da529dddc192f65671d28ba41df840490aca Mon Sep 17 00:00:00 2001
From: ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Fri, 11 Nov 2005 11:18:38 +0000
Subject: - readd gnomehier   This version uses gnome-pre-su-install to create
 directories   and still uses MTREE file. This removes the need for having  
 to bump PORTREVISION in gnomehier and have to keep the GNOME_MTREE   in sync
 with X11 MTREE_FILE. Also gnomehier now only creates directories   from
 dirlist.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5107 df743ca5-7f9a-e211-a948-0013205c9059
---
 Mk/bsd.gnome.mk | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'Mk/bsd.gnome.mk')

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 1f8fbb859..75a080e92 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.335 2005/11/06 02:55:14 ahze Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.336 2005/11/07 20:31:31 marcus Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -684,12 +684,6 @@ GNOME_PRE_PATCH+=	; ${${component}_PRE_PATCH}
 . endfor
 .endif
 
-.if defined(_USE_GNOME)
-.if ${_USE_GNOME:Mgnomeprefix}!=""
-MTREE_FILE?=	${GNOME_MTREE}
-.endif
-.endif
-
 .if defined(GNOME_PRE_PATCH)
 USE_REINPLACE=	yes
 
@@ -720,11 +714,15 @@ CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http://
 .endif
 
 
-.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) || defined(INSTALLS_ICONS)
+.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) || defined(INSTALLS_ICONS) \
+	|| ${_USE_GNOME:Mgnomeprefix}!=""
 pre-su-install: gnome-pre-su-install
 post-install: gnome-post-install
 
 gnome-pre-su-install:
+.if ${_USE_GNOME:Mgnomeprefix}!="" && !defined(NO_MTREE)
+	${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE}/} ${PREFIX}/
+.endif
 .if defined(GCONF_SCHEMAS)
 	@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/
 .else
-- 
cgit v1.2.3