diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-01-24 14:58:19 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-01-24 14:58:19 +0800 |
| commit | 38c1c40e465186b98bde9d75a5feb5d5d58d5c97 (patch) | |
| tree | 34042224fd30faa8253f8a966ee6ecdd5bcd9fac /Mk | |
| parent | b4b5dfd940c5a67b13ea4ffa832e2a0008b94547 (diff) | |
| download | marcuscom-ports-38c1c40e465186b98bde9d75a5feb5d5d58d5c97.tar marcuscom-ports-38c1c40e465186b98bde9d75a5feb5d5d58d5c97.tar.gz marcuscom-ports-38c1c40e465186b98bde9d75a5feb5d5d58d5c97.tar.bz2 marcuscom-ports-38c1c40e465186b98bde9d75a5feb5d5d58d5c97.tar.lz marcuscom-ports-38c1c40e465186b98bde9d75a5feb5d5d58d5c97.tar.xz marcuscom-ports-38c1c40e465186b98bde9d75a5feb5d5d58d5c97.tar.zst marcuscom-ports-38c1c40e465186b98bde9d75a5feb5d5d58d5c97.zip | |
Make the GConf schema installation code a bit nicer.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5524 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index ad99c3cc1..3160767e2 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.355 2006/01/24 01:34:00 marcus Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.356 2006/01/24 02:12:09 marcus Exp $ # # Please view me with 4 column tabs! @@ -96,7 +96,8 @@ gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier GNOME_HTML_DIR?= ${PREFIX}/share/doc GCONF_CONFIG_OPTIONS?= merged -GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/etc/gconf/gconf.xml.defaults +GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults +GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY} gnomeprefix_CONFIGURE_ENV=GTKDOC="false" gnomeprefix_CONFIGURE_ARGS=--localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ @@ -737,10 +738,10 @@ gnome-pre-su-install: gnome-post-install: . if defined(GCONF_SCHEMAS) @for i in ${GCONF_SCHEMAS}; do \ - ${ECHO_CMD} "@unexec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \ + ${ECHO_CMD} "@unexec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/${GCONF_CONFIG_DIRECTORY} gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ ${ECHO_CMD} "etc/gconf/schemas/$${i}" >> ${TMPPLIST}; \ - ${ECHO_CMD} "@exec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \ + ${ECHO_CMD} "@exec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/${GCONF_CONFIG_DIRECTORY} gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ done . endif |