Stefan Fiedler <stefan.fiedler@students.jku.at>:

fixed old useages of QT31DIR (we now export QTDIR properly ...)


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2225 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

package/blindcoder/licq/licq.conf

@@ -33,13 +33,11 @@ licq_custmain () {
 		eval $MAKE $makeopt ; eval $MAKE $makeopt install
 	fi
 	if [ $ROCKCFG_PKG_LICQ_QTG == 1 ] ; then
-		export QTDIR="$QT31DIR"
 		cd $builddir/licq-$ver/plugins/qt-gui
 		eval ./configure $confopt
 		eval $MAKE $makeopt ; eval $MAKE $makeopt install
 	fi
 	if [ $ROCKCFG_PKG_LICQ_KDE == 1 ] ; then
-		export QTDIR="$QT31DIR"
 		cd $builddir/licq-$ver/plugins/qt-gui
 		eval ./configure $confopt --with-kde
 		eval $MAKE $makeopt ; eval $MAKE $makeopt install

package/clifford/mysqlcc/mysqlcc.conf

@@ -20,9 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-# We need QT-3.0.x
-export QTDIR="$QT31DIR"
-
 # MyCC needs new version of ./config.sub
 autogen=1
 

package/jsaw/scribus/scribus.conf

@@ -22,8 +22,8 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 # make sure the right qt and kde libs are used
-export LD_LIBRARY_PATH="$QT31DIR/lib:/$prefix/lib:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="$QTDIR/lib:/$prefix/lib:$LD_LIBRARY_PATH"
 
 # KDE specific configure options
-confopt="$confopt --with-qt-dir=$QT31DIR --with-qt-includes=$QT31DIR/include \
- --with-qt-libraries=$QT31DIR/lib"
+confopt="$confopt --with-qt-dir=$QTDIR --with-qt-includes=$QTDIR/include \
+ --with-qt-libraries=$QTDIR/lib"

package/stefanp/psi/psi.conf

@@ -21,7 +21,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-export QTDIR="$QT31DIR"
 [ -n "$ROCKCFG_PKG_KDE31_CORE_PREFIX" ] && \
 	export KDEDIR="$prefix/$ROCKCFG_PKG_KDE31_CORE_PREFIX"