diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-01-24 10:12:09 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-01-24 10:12:09 +0800 |
| commit | b4b5dfd940c5a67b13ea4ffa832e2a0008b94547 (patch) | |
| tree | 3cc3db9bf0cb4901b898531db331b67ec2ac2f93 | |
| parent | e9f6034543421d802e692099187e22fa5d6e041a (diff) | |
| download | marcuscom-ports-b4b5dfd940c5a67b13ea4ffa832e2a0008b94547.tar marcuscom-ports-b4b5dfd940c5a67b13ea4ffa832e2a0008b94547.tar.gz marcuscom-ports-b4b5dfd940c5a67b13ea4ffa832e2a0008b94547.tar.bz2 marcuscom-ports-b4b5dfd940c5a67b13ea4ffa832e2a0008b94547.tar.lz marcuscom-ports-b4b5dfd940c5a67b13ea4ffa832e2a0008b94547.tar.xz marcuscom-ports-b4b5dfd940c5a67b13ea4ffa832e2a0008b94547.tar.zst marcuscom-ports-b4b5dfd940c5a67b13ea4ffa832e2a0008b94547.zip | |
Make sure our gconf package magic uses merged schemas.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5523 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | Mk/bsd.gnome.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index eaf101cf0..ad99c3cc1 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.354 2006/01/22 20:39:36 pav Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.355 2006/01/24 01:34:00 marcus Exp $ # # Please view me with 4 column tabs! @@ -737,10 +737,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::%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/etc/gconf/gconf.xml.defaults 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::%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/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ done . endif |