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:
parent
f5826dc026
commit
497f7434b1
|
@ -23,12 +23,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
if [ -d /usr/lib64/qt/lib ]; then
|
QT3DIR=/opt/qt-3
|
||||||
LIBDIR=lib64
|
MANPATH=$MANPATH:/opt/qt-3/doc/man
|
||||||
else
|
#PATH=$PATH:/opt/qt-3/qt/bin
|
||||||
LIBDIR=lib
|
export QTDIR MANPATH
|
||||||
fi
|
|
||||||
QTDIR=/usr/$LIBDIR/qt
|
|
||||||
MANPATH=$MANPATH:/usr/$LIBDIR/qt/doc/man
|
|
||||||
PATH=$PATH:/usr/$LIBDIR/qt/bin
|
|
||||||
export QTDIR MANPATH PATH
|
|
||||||
|
|
|
@ -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
|
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
|
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
|
||||||
fi
|
fi
|
||||||
ldconfig
|
ldconfig
|
||||||
|
|
Loading…
Reference in New Issue
Block a user