Browse Source

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!
early
Christian Wiese 17 years ago
parent
commit
dda5575a40
  1. 21
      qt/qt3/qt3.conf

21
qt/qt3/qt3.conf

@ -1,7 +1,7 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # 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) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2004 Clifford Wolf # Copyright (C) 1998 - 2004 Clifford Wolf
@ -15,10 +15,12 @@
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
prefix="${SDECFG_PKG_QT3_PREFIX:-usr}" prefix="${SDECFG_PKG_QT3_PREFIX:-usr}"
set_confopt
if [ "$prefix" = "usr" ]; then if [ "$prefix" = "usr" ]; then
docdir=$docdir/$pkg includedir=$includedir/$pkg
datadir=$datadir/$pkg
fi fi
set_confopt
qt_preconf() { qt_preconf() {
QTDIR=$PWD QTDIR=$PWD
@ -32,13 +34,14 @@ qt_preconf() {
hook_add preconf 5 qt_preconf hook_add preconf 5 qt_preconf
# Qt only supports some selected options ... # Qt only supports some selected options ...
confopt="-prefix $root/$prefix -bindir $root/$bindir \ confopt="-prefix $root/$prefix \
-libdir $root/$libdir -docdir $root/$docdir \ -bindir $root/$bindir \
-headerdir $root/$includedir/$pkg \ -headerdir $root/$includedir \
-libdir $root/$libdir \
-plugindir $root/$libdir/$pkg/plugins \ -plugindir $root/$libdir/$pkg/plugins \
-datadir $root/$datadir/$pkg \ -datadir $root/$datadir \
-translationdir $root/$datadir/$pkg/translations \ -docdir $root/$docdir \
-sysconfdir $root/$sysconfdir -v \ -translationdir $root/$datadir/translations \
-thread -qt-gif -system-zlib \ -thread -qt-gif -system-zlib \
-system-libmng -system-libpng -system-libjpeg -xft -xrender" -system-libmng -system-libpng -system-libjpeg -xft -xrender"

Loading…
Cancel
Save