diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-07-15 23:14:15 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-07-15 23:14:15 (GMT) |
| commit | 9044f7a064adf5a9c8da051ef340537671486d37 (patch) | |
| tree | 3b9eeccfc072bf22a98a5ab47a50aa46b2f2f4f9 /scripts | |
| parent | 9123ad8d5e137f9a63059a14ba2c385b89a4f9cf (diff) | |
| parent | d6ae9633948a3430a3d2e3ccec85828782d5573f (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index caa9ac4..36dc2ee 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -159,8 +159,11 @@ build_glew() cd glew-$version mkdir -p $DEPLOYDIR/lib/pkgconfig - # uncomment this kludge for Fedora 64bit - # sed -i s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ config/Makefile.linux + # Fedora 64-bit + if [ "`ls /usr/lib64 | grep Xmu`" ]; then + echo "modifying glew makefile for 64 bit machine" + sed -ibak s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ config/Makefile.linux + fi GLEW_DEST=$DEPLOYDIR make -j$NUMCPU GLEW_DEST=$DEPLOYDIR make install @@ -177,10 +180,13 @@ build_opencsg() fi tar xzf OpenCSG-$version.tar.gz cd OpenCSG-$version - sed -i s/example// opencsg.pro # examples might be broken without GLUT + sed -ibak s/example// opencsg.pro # examples might be broken without GLUT - # uncomment this kludge for Fedora 64bit - # sed -i s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ src/Makefile + # Fedora 64-bit + if [ "`ls /usr/lib64 | grep Xmu`" ]; then + echo "modifying opencsg makefile for 64 bit machine" + sed -ibak s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ src/Makefile + fi if [ "`command -v qmake-qt4`" ]; then qmake-qt4 |