diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-24 02:43:43 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-24 02:43:43 (GMT) |
| commit | f1634d545dafecb745f32fa786d351e95b545280 (patch) | |
| tree | 36342df7c93328f4db71988466e21c10b429a0ef /scripts/linux-build-dependencies.sh | |
| parent | ec01e7f492cb750221464dc09d8d3e3d18607d18 (diff) | |
| parent | dcb8c201199d45c082992377bcabda92574abd83 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Conflicts:
scripts/linux-build-dependencies.sh
Diffstat (limited to 'scripts/linux-build-dependencies.sh')
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index be27d2a..a9dbbc5 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -207,6 +207,10 @@ build_opencsg() fi fi + if [ `uname | grep FreeBSD` ]; then + sed -ibak s/X11R6/local/g src/Makefile + fi + if [ "`command -v qmake-qt4`" ]; then OPENCSG_QMAKE=qmake-qt4 else @@ -225,6 +229,7 @@ build_opencsg() fi make + cp -av lib/* $DEPLOYDIR/lib cp -av include/* $DEPLOYDIR/include cd $OPENSCADDIR @@ -267,7 +272,7 @@ if [ ! $NUMCPU ]; then fi if [ ! -d $BASEDIR/bin ]; then - mkdir --parents $BASEDIR/bin + mkdir -p $BASEDIR/bin fi echo "Using basedir:" $BASEDIR |