From cd688d1438ed3f114964344438c5af464d97e90a Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Wed, 18 May 2011 18:19:08 +0200 Subject: [PATCH] gconf: changed to use default prefix instead of 'opt/gnome2' --- gnome2/gconf/config.in | 4 ++-- gnome2/gconf/gnome2-conf.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnome2/gconf/config.in b/gnome2/gconf/config.in index 26ff7eee5..9c86b9705 100644 --- a/gnome2/gconf/config.in +++ b/gnome2/gconf/config.in @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../gconf/config.in -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # @@ -17,7 +17,7 @@ if pkgcheck gconf X; then menu_begin MENU_PKG_GNOME2 'GNOME 2 Package Options' text 'Install prefix for GNOME 2 Packages' \ - SDECFG_PKG_GNOME2_CORE_PREFIX "opt/gnome2" + SDECFG_PKG_GNOME2_CORE_PREFIX "usr" menu_end fi diff --git a/gnome2/gconf/gnome2-conf.in b/gnome2/gconf/gnome2-conf.in index 1e035e066..fdb80ca5e 100644 --- a/gnome2/gconf/gnome2-conf.in +++ b/gnome2/gconf/gnome2-conf.in @@ -3,7 +3,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../gconf/gnome2-conf.in -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -18,7 +18,7 @@ echo_status "Loading generic gnome configuration..." if [ "$prefix_auto" = 1 ] ; then if [ "$pkg" == "gconf" ]; then - prefix=${SDECFG_PKG_GNOME2_CORE_PREFIX:-opt/gnome2} + prefix=${SDECFG_PKG_GNOME2_CORE_PREFIX:-usr} else pkgprefix -t gconf prefix=`pkgprefix gconf`