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
This commit is contained in:
kueller 2010-01-19 10:31:58 +00:00
parent f5826dc026
commit 497f7434b1
2 changed files with 7 additions and 12 deletions

View File

@ -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

View File

@ -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