From d371b2db8c8c62c4745ca5c8c1d44f3c6acb8a67 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Tue, 2 Mar 2004 20:27:24 +0000 Subject: [PATCH] Stefan Paletta (and /me): changed kde31 to kde32 and KDE31 to KDE32 everywhere git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2439 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/gnome24/gnome-desktop/gnome-desktop.conf | 2 +- package/gnome24/scrollkeeper/scrollkeeper.conf | 2 +- package/stefanp/psi/psi.conf | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnome24/gnome-desktop/gnome-desktop.conf b/package/gnome24/gnome-desktop/gnome-desktop.conf index 865fe8983..d9cba4628 100644 --- a/package/gnome24/gnome-desktop/gnome-desktop.conf +++ b/package/gnome24/gnome-desktop/gnome-desktop.conf @@ -25,7 +25,7 @@ var_append confopt ' ' '--with-gnome-distributor="ROCK Linux (http://www.rocklinux.org)"' -for dir in usr opt/kde31 $ROCKCFG_PKG_KDE31_CORE_PREFIX ; do +for dir in usr opt/kde32 $ROCKCFG_PKG_KDE32_CORE_PREFIX ; do [ -f "$root/$dir/bin/artsd" ] && kdeprefix="$dir" done diff --git a/package/gnome24/scrollkeeper/scrollkeeper.conf b/package/gnome24/scrollkeeper/scrollkeeper.conf index d80a02257..e6e5d7606 100644 --- a/package/gnome24/scrollkeeper/scrollkeeper.conf +++ b/package/gnome24/scrollkeeper/scrollkeeper.conf @@ -22,7 +22,7 @@ . $base/package/*/*/gnome-24.conf -confopt="$confopt --with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf:/opt/kde31/omf" +confopt="$confopt --with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf:/opt/kde32/omf" scrollkeeper_pm() { echo "Installing cron script ..." diff --git a/package/stefanp/psi/psi.conf b/package/stefanp/psi/psi.conf index 6fe4cfb31..2d6d80a9a 100644 --- a/package/stefanp/psi/psi.conf +++ b/package/stefanp/psi/psi.conf @@ -21,9 +21,9 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -if [ -n "$ROCKCFG_PKG_KDE31_CORE_PREFIX" ] ; then - export KDEDIR="$root/$ROCKCFG_PKG_KDE31_CORE_PREFIX" - prefix=${ROCKCFG_PKG_KDE31_CORE_PREFIX} ; set_confopt +if [ -n "$ROCKCFG_PKG_KDE32_CORE_PREFIX" ] ; then + export KDEDIR="$root/$ROCKCFG_PKG_KDE32_CORE_PREFIX" + prefix=${ROCKCFG_PKG_KDE32_CORE_PREFIX} ; set_confopt fi confopt="--prefix=$root/$prefix"