From bd520105849e18de3e40e234ae1478f13d277e61 Mon Sep 17 00:00:00 2001 From: Benjamin Schieder Date: Thu, 23 Mar 2006 00:13:49 +0000 Subject: [PATCH] Benjamin Schieder: untested try to get KDE from /opt/kde3 to /usr [2006030913432709928] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7322 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/gnome2/gnome-desktop/gnome-desktop.conf | 2 +- package/gnome2/scrollkeeper/scrollkeeper.conf | 2 +- package/kde/kde-3.conf | 2 +- package/kde/kdebase/kdm.cron | 4 ++-- package/kde/kdelibs/config.in | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/gnome2/gnome-desktop/gnome-desktop.conf b/package/gnome2/gnome-desktop/gnome-desktop.conf index 4977b2b97..9e17942f8 100644 --- a/package/gnome2/gnome-desktop/gnome-desktop.conf +++ b/package/gnome2/gnome-desktop/gnome-desktop.conf @@ -25,7 +25,7 @@ var_append confopt ' ' '--with-gnome-distributor=ROCK-Linux' -for dir in usr opt/kde3 $ROCKCFG_PKG_KDE3_CORE_PREFIX ; do +for dir in usr $ROCKCFG_PKG_KDE3_CORE_PREFIX ; do [ -f "$root/$dir/bin/artsd" ] && kdeprefix="$dir" done diff --git a/package/gnome2/scrollkeeper/scrollkeeper.conf b/package/gnome2/scrollkeeper/scrollkeeper.conf index 3c1d1f36a..a097cec71 100644 --- a/package/gnome2/scrollkeeper/scrollkeeper.conf +++ b/package/gnome2/scrollkeeper/scrollkeeper.conf @@ -22,7 +22,7 @@ . $base/package/gnome2/gnome-2.conf -confopt="$confopt --with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf:/opt/kde3/omf" +confopt="$confopt --with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf" scrollkeeper_pm() { echo "Installing cron script ..." diff --git a/package/kde/kde-3.conf b/package/kde/kde-3.conf index 7812ac829..0ad5a2595 100644 --- a/package/kde/kde-3.conf +++ b/package/kde/kde-3.conf @@ -3,7 +3,7 @@ if [ "$prefix_auto" = 1 ] ; then if [ "$NO_SANITY_CHECK" ] ; then prefix=$ROCKCFG_PKG_KDE3_CORE_PREFIX else - for dir in usr opt/kde3 $ROCKCFG_PKG_KDE3_CORE_PREFIX ; do + for dir in usr $ROCKCFG_PKG_KDE3_CORE_PREFIX ; do [ -f "$root/$dir/bin/artsd" ] && prefix="$dir" done diff --git a/package/kde/kdebase/kdm.cron b/package/kde/kdebase/kdm.cron index bd06b2eb8..eeae16782 100755 --- a/package/kde/kdebase/kdm.cron +++ b/package/kde/kdebase/kdm.cron @@ -1,7 +1,7 @@ #!/bin/sh -confprefix=/opt/kde3/share/config/kdm/ -sessprefix=/opt/kde3/share/apps/kdm/sessions/ +confprefix=/usr/share/config/kdm/ +sessprefix=/usr/share/apps/kdm/sessions/ echo "Creating kdm session scripts from ROCK wm registry ..." diff --git a/package/kde/kdelibs/config.in b/package/kde/kdelibs/config.in index 08c1719b3..a037bded4 100644 --- a/package/kde/kdelibs/config.in +++ b/package/kde/kdelibs/config.in @@ -23,7 +23,7 @@ if pkgcheck kdelibs X ; then menu_begin MENU_PKG_KDE3 'KDE 3.x Package Options' text 'Install prefix for KDE 3.x packages' \ - ROCKCFG_PKG_KDE3_CORE_PREFIX "opt/kde3" + ROCKCFG_PKG_KDE3_CORE_PREFIX "usr" bool 'Generate KDE library documentation' \ ROCKCFG_PKG_KDE3_APIDOX 0 menu_end