diff --git a/kde/qt3/config.hlp b/kde/qt3/config.hlp index c05c60c09..a111ecd08 100644 --- a/kde/qt3/config.hlp +++ b/kde/qt3/config.hlp @@ -12,11 +12,11 @@ # GNU General Public License can be found in the file COPYING. # --- T2-COPYRIGHT-NOTE-END --- -MENU_PKG_QT - Here you'll find options for Qt. +MENU_PKG_QT3 + Here you'll find options for Qt3. -SDECFG_PKG_QT_PREFIX - Please enter the prefix where you want Qt installed. +SDECFG_PKG_QT3_PREFIX + Please enter the prefix where you want Qt3 installed. -SDECFG_PKG_QT_EXCEPTION_STL 1 +SDECFG_PKG_QT3_EXCEPTION_STL 1 Whether to enable support for STL data types and exceptions. diff --git a/kde/qt3/config.in b/kde/qt3/config.in index 8c22ecb35..9637c49a6 100644 --- a/kde/qt3/config.in +++ b/kde/qt3/config.in @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../qt/config.in -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,12 +12,13 @@ # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- + if pkgcheck qt3 X ; then - menu_begin MENU_PKG_TQ 'Qt Package Options' - text 'Install prefix for Qt' \ - SDECFG_PKG_QT_PREFIX "opt/qt3" + menu_begin MENU_PKG_QT3 'Qt3 Package Options' + text 'Install prefix for Qt3' \ + SDECFG_PKG_QT3_PREFIX "usr" bool 'Enable exception and STL support' \ - SDECFG_PKG_QT_EXCEPTION_STL 0 + SDECFG_PKG_QT3_EXCEPTION_STL 0 menu_end fi diff --git a/kde/qt3/qt3.conf b/kde/qt3/qt3.conf index 2b17af591..051b03847 100644 --- a/kde/qt3/qt3.conf +++ b/kde/qt3/qt3.conf @@ -14,10 +14,12 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -prefix="${SDECFG_PKG_QT_PREFIX:-opt/qt3}" +prefix="${SDECFG_PKG_QT_PREFIX:-usr}" +if [ "$prefix" = "usr" ]; then + docdir=$docdir/$pkg +fi set_confopt - qt_preconf() { QTDIR=$PWD var_insert LD_LIBRARY_PATH ':' "$QTDIR/lib"