vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

remove /opt/qt5 hack in setenv script. (distros have their own way to specify)

master
Don Bright 2014-04-26 22:46:08 -05:00
parent 05e1dd7df4
commit d32956a942
1 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/setenv-unibuild.sh
View File

@ -110,9 +110,7 @@ setenv_netbsd_clang()
clean_note()
{
if [ $QT5_SETUP ]; then
QMAKEBIN=qmake
elif [ "`command -v qmake-qt4`" ]; then
if [ "`command -v qmake-qt4`" ]; then
QMAKEBIN=qmake-qt4
else
QMAKEBIN=qmake
@ -120,37 +118,6 @@ clean_note()
echo "Please re-run" $QMAKEBIN "and run 'make clean' if necessary"
}
setenv_qt5()
{
QT5_SETUP=true
if [ ! $QTDIR ]; then
QTDIR=/opt/qt5
echo Please set QTDIR before running this qt5 script. Assuming $QTDIR
fi
PATH=$QTDIR/bin:$PATH
LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
LD_RUN_PATH=$QTDIR/lib:$LD_RUN_PATH
if [ "`echo $CC | grep clang`" ]; then
if [ "`uname | grep -i linux`" ]; then
QMAKESPEC=linux-clang
echo QMAKESPEC has been modified: $QMAKESPEC
fi
fi
export QTDIR
export PATH
export LD_LIBRARY_PATH
export LD_RUN_PATH
export QMAKESPEC
echo QTDIR is set to: $QTDIR
echo PATH has been modified with $QTDIR/bin
echo LD_LIBRARY_PATH has been modified with $QTDIR/lib
echo LD_RUN_PATH has been modified with $QTDIR/lib
export QT5_SETUP
}
if [ "`uname | grep -i 'linux\|debian'`" ]; then
setenv_common
if [ "`echo $* | grep clang`" ]; then
@ -172,10 +139,6 @@ else
echo unknown system. guessed env variables. see 'setenv-unibuild.sh'
fi
if [ "`echo $* | grep qt5`" ]; then
setenv_qt5
fi
if [ -e $DEPLOYDIR/include/Qt ]; then
echo "Qt found under $DEPLOYDIR ... "
QTDIR=$DEPLOYDIR