From dda5575a40525636bc321233242135cbac150478 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sat, 13 Oct 2007 05:30:12 +0300 Subject: [PATCH] Fixed qt3 to not generate $sysconfdir/qt_plugins_3.3rc * Do _not_ use a global sysconfdir because we'll end up with shared files while building kdelibs and maybe other kde components! --- qt/qt3/qt3.conf | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/qt/qt3/qt3.conf b/qt/qt3/qt3.conf index 2a7cb7227..4d7b49930 100644 --- a/qt/qt3/qt3.conf +++ b/qt/qt3/qt3.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../qt/qt.conf +# Filename: package/.../qt3/qt3.conf # Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf @@ -15,10 +15,12 @@ # --- SDE-COPYRIGHT-NOTE-END --- prefix="${SDECFG_PKG_QT3_PREFIX:-usr}" +set_confopt + if [ "$prefix" = "usr" ]; then - docdir=$docdir/$pkg + includedir=$includedir/$pkg + datadir=$datadir/$pkg fi -set_confopt qt_preconf() { QTDIR=$PWD @@ -32,15 +34,16 @@ qt_preconf() { hook_add preconf 5 qt_preconf # Qt only supports some selected options ... - confopt="-prefix $root/$prefix -bindir $root/$bindir \ - -libdir $root/$libdir -docdir $root/$docdir \ - -headerdir $root/$includedir/$pkg \ - -plugindir $root/$libdir/$pkg/plugins \ - -datadir $root/$datadir/$pkg \ - -translationdir $root/$datadir/$pkg/translations \ - -sysconfdir $root/$sysconfdir -v \ - -thread -qt-gif -system-zlib \ - -system-libmng -system-libpng -system-libjpeg -xft -xrender" + confopt="-prefix $root/$prefix \ + -bindir $root/$bindir \ + -headerdir $root/$includedir \ + -libdir $root/$libdir \ + -plugindir $root/$libdir/$pkg/plugins \ + -datadir $root/$datadir \ + -docdir $root/$docdir \ + -translationdir $root/$datadir/translations \ + -thread -qt-gif -system-zlib \ + -system-libmng -system-libpng -system-libjpeg -xft -xrender" [[ $libdir = *lib64* ]] && var_append confopt ' ' '-platform linux-g++-64'