From 497f7434b13f3f445eb167daa28c3d43f5223c05 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 19 Jan 2010 10:31:58 +0000
Subject: [PATCH] Anpassung an installation in /opt/qt-3. QTDIR wird als QT3DIR
 gesetzt - ist in make modulen passend umzusetzen! Default in Viitor ist
 qt-4!!

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/Viitor_qt@5133 504e572c-2e33-0410-9681-be2bf7408885
---
 etc/sysconfig/profile.d/qtlib | 13 ++++---------
 tmp/postinstall               |  6 +++---
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/etc/sysconfig/profile.d/qtlib b/etc/sysconfig/profile.d/qtlib
index 7414583..f61d4a4 100644
--- a/etc/sysconfig/profile.d/qtlib
+++ b/etc/sysconfig/profile.d/qtlib
@@ -23,12 +23,7 @@
 #
 
 
-if [ -d /usr/lib64/qt/lib ]; then
-	LIBDIR=lib64
-else
-	LIBDIR=lib
-fi
-QTDIR=/usr/$LIBDIR/qt
-MANPATH=$MANPATH:/usr/$LIBDIR/qt/doc/man
-PATH=$PATH:/usr/$LIBDIR/qt/bin
-export QTDIR MANPATH PATH
+QT3DIR=/opt/qt-3
+MANPATH=$MANPATH:/opt/qt-3/doc/man
+#PATH=$PATH:/opt/qt-3/qt/bin
+export QTDIR MANPATH
diff --git a/tmp/postinstall b/tmp/postinstall
index abcc94d..288858b 100644
--- a/tmp/postinstall
+++ b/tmp/postinstall
@@ -59,11 +59,11 @@
 #
 #
 
-INSTALLED=`grep "/usr/lib/qt" /etc/ld.so.conf`
+INSTALLED=`grep "/opt/qt-3/lib" /etc/ld.so.conf`
 if [ ! "$INSTALLED" ]; then
-	echo "/usr/lib/qt/lib" >>/etc/ld.so.conf
+	echo "/opt/qt-3/lib" >>/etc/ld.so.conf
 	if [ -d /usr/lib64 ]; then
-		echo "/usr/lib64/qt/lib" >>/etc/ld.so.conf
+		echo "/opt/qt-3/lib64" >>/etc/ld.so.conf
 	fi
 fi
 ldconfig