summaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-01-24 09:34:00 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-01-24 09:34:00 +0800
commit467cf19cc9d071ba177d84daa8b29c5ba639a8d5 (patch)
treef090db9e80e931c37d0f979dd5a2d29a06672bb3 /Mk
parentf4347768830f94d9850c390df048a555434b4d6e (diff)
downloadmarcuscom-ports-467cf19cc9d071ba177d84daa8b29c5ba639a8d5.tar
marcuscom-ports-467cf19cc9d071ba177d84daa8b29c5ba639a8d5.tar.gz
marcuscom-ports-467cf19cc9d071ba177d84daa8b29c5ba639a8d5.tar.bz2
marcuscom-ports-467cf19cc9d071ba177d84daa8b29c5ba639a8d5.tar.lz
marcuscom-ports-467cf19cc9d071ba177d84daa8b29c5ba639a8d5.tar.xz
marcuscom-ports-467cf19cc9d071ba177d84daa8b29c5ba639a8d5.tar.zst
marcuscom-ports-467cf19cc9d071ba177d84daa8b29c5ba639a8d5.zip
GConf is using merged schemas now.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5521 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.gnome.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 86f8b2a55..eaf101cf0 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.353 2006/01/21 08:50:56 marcus Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.354 2006/01/22 20:39:36 pav Exp $
#
# Please view me with 4 column tabs!
@@ -95,7 +95,7 @@ gnomehier_DETECT= ${GNOME_MTREE}
gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
GNOME_HTML_DIR?= ${PREFIX}/share/doc
-GCONF_CONFIG_OPTIONS?=
+GCONF_CONFIG_OPTIONS?= merged
GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/etc/gconf/gconf.xml.defaults
gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
gnomeprefix_CONFIGURE_ARGS=--localstatedir=${PREFIX}/share/gnome \