From fb8bc6cd52dcfeb502c407baa0165be0fcd52807 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 23 Nov 2007 08:42:59 +0000 Subject: [PATCH] Clifford Wolf: Added default fallbacks for missing PREFIX config variables (they are missing if the packages are configured-out but built manually) [2007110916004418433] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8866 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/avm/xfce4/xfce4.conf | 2 +- package/e17/imlib2/e17.conf | 2 +- package/gnome14/gnome-14.conf | 2 +- package/gnome2/gnome-2.conf | 2 +- package/kde/kde-3.conf | 2 +- package/tschmidt/unreal-ircd/unreal-ircd.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/avm/xfce4/xfce4.conf b/package/avm/xfce4/xfce4.conf index c1641deb1..102d93421 100644 --- a/package/avm/xfce4/xfce4.conf +++ b/package/avm/xfce4/xfce4.conf @@ -21,7 +21,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- if [ "$prefix_auto" = 1 ] ; then - prefix=$ROCKCFG_PKG_XFCE4_CORE_PREFIX + prefix=${ROCKCFG_PKG_XFCE4_CORE_PREFIX:-usr} set_confopt fi diff --git a/package/e17/imlib2/e17.conf b/package/e17/imlib2/e17.conf index a93ec5cdc..96f1d9620 100644 --- a/package/e17/imlib2/e17.conf +++ b/package/e17/imlib2/e17.conf @@ -1,6 +1,6 @@ if [ "$prefix_auto" = 1 ] ; then - prefix=$ROCKCFG_PKG_E17_CORE_PREFIX + prefix=${ROCKCFG_PKG_E17_CORE_PREFIX:-usr} for dir in opt/e17 usr $ROCKCFG_PKG_E17_CORE_PREFIX ; do [ -f "$root/$dir/lib/libImlib2.so" ] && prefix="$dir" done diff --git a/package/gnome14/gnome-14.conf b/package/gnome14/gnome-14.conf index d114716b7..012ab99b6 100644 --- a/package/gnome14/gnome-14.conf +++ b/package/gnome14/gnome-14.conf @@ -22,7 +22,7 @@ if [ "$prefix_auto" = 1 ] ; then if [ "$NO_SANITY_CHECK" ] ; then - prefix=$ROCKCFG_PKG_GNOME14_CORE_PREFIX + prefix=${ROCKCFG_PKG_GNOME14_CORE_PREFIX:-usr} else for dir in usr opt/gnome $ROCKCFG_PKG_GNOME14_CORE_PREFIX ; do [ -f "$root/$dir/lib/libglib.so" ] && prefix="$dir" diff --git a/package/gnome2/gnome-2.conf b/package/gnome2/gnome-2.conf index 729f4e638..6c4194aae 100644 --- a/package/gnome2/gnome-2.conf +++ b/package/gnome2/gnome-2.conf @@ -23,7 +23,7 @@ if [ "$prefix_auto" = 1 ] ; then if [ "$NO_SANITY_CHECK" ] ; then - prefix=$ROCKCFG_PKG_GNOME2_CORE_PREFIX + prefix=${ROCKCFG_PKG_GNOME2_CORE_PREFIX:-usr} else for dir in usr opt/gnome2 $ROCKCFG_PKG_GNOME2_CORE_PREFIX ; do [ -f "$root/$dir/lib/libglib-2.0.so" ] && prefix="$dir" diff --git a/package/kde/kde-3.conf b/package/kde/kde-3.conf index 6be4961cc..d45be4e82 100644 --- a/package/kde/kde-3.conf +++ b/package/kde/kde-3.conf @@ -1,7 +1,7 @@ if [ "$prefix_auto" = 1 ] ; then if [ "$NO_SANITY_CHECK" ] ; then - prefix=$ROCKCFG_PKG_KDE3_CORE_PREFIX + prefix=${ROCKCFG_PKG_KDE3_CORE_PREFIX:-usr} else for dir in usr $ROCKCFG_PKG_KDE3_CORE_PREFIX ; do [ -f "$root/$dir/bin/artsd" ] && prefix="$dir" diff --git a/package/tschmidt/unreal-ircd/unreal-ircd.conf b/package/tschmidt/unreal-ircd/unreal-ircd.conf index 28ce3c964..551a0e2b4 100644 --- a/package/tschmidt/unreal-ircd/unreal-ircd.conf +++ b/package/tschmidt/unreal-ircd/unreal-ircd.conf @@ -22,7 +22,7 @@ if [ "$prefix_auto" = 1 ] ; then - prefix=$ROCKCFG_PKG_UNREAL_PREFIX + prefix=${ROCKCFG_PKG_UNREAL_PREFIX:-usr} fi if [ "$ROCKCFG_PKG_UNREAL_DMODS" = 1 ] ; then extraconfopt="$extraconfopt --enable-dynamic-linking"