From 49efe9fd1569978fb5c61b9d3a3c4d68cbbb0a81 Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 29 Nov 2004 23:25:55 +0000 Subject: Be more careful about creating ${PREFIX}/etc/gconf, so that it is only done when the port installs GConf schemas. Obtained from: FreeBSD ports tree git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3158 df743ca5-7f9a-e211-a948-0013205c9059 --- Mk/bsd.gnome.mk | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 2e91d6fca..e36137946 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -654,19 +654,17 @@ PLIST_SUB+= GNOMEDESKTOP:="@comment " NOGNOMEDESKTOP:="" CONFIGURE_FAIL_MESSAGE= "Please direct the output of the failure of the make command to a file, and then feed that file to the gnomelogalyzer, available from "http://www.freebsd.org/gnome/gnomelogalyzer.sh", which will diagnose the problem and suggest a solution. If - and only if - the gnomelogalyzer cannot solve the problem, report the problem to the FreeBSD GNOME team at ${MAINTAINER}, and attach \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\" and the output of the failure of the make command. Also, it might be a good idea to provide an overview of all packages installed on your system (e.g. an \`ls ${PKG_DBDIR}\`)." .endif -.if defined(_USE_GNOME) -. if ${_USE_GNOME:Mgconf}!="" || ${_USE_GNOME:Mgconf2}!="" -pre-install: gnome-pre-install +.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) +pre-su-install: gnome-pre-su-install +post-install: gnome-post-install -gnome-pre-install: +gnome-pre-su-install: +.if defined(GCONF_SCHEMAS) @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/ - -. endif +.else + @${DO_NADA} .endif -.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) -post-install: gnome-post-install - gnome-post-install: . if defined(GCONF_SCHEMAS) @for i in ${GCONF_SCHEMAS}; do \ -- cgit v1.2.3