diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-15 03:59:15 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-15 03:59:15 (GMT) |
| commit | b74bb392afbeee062b9654dac78950fc85c4c884 (patch) | |
| tree | fa24632088f8dee0f91d8500619a820d61d4b030 /scripts | |
| parent | 6d3304a30669b24bec9d70c4086ee109e47aefb0 (diff) | |
generalized MACOSX_DEPLOY_DIR into the platform-independent OPENSCAD_LIBRARIES
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 2 | ||||
| -rwxr-xr-x | scripts/publish-macosx.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index e69d594..bc42058 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -190,7 +190,7 @@ build_opencsg() tar xzf OpenCSG-$version.tar.gz cd OpenCSG-$version patch -p1 < $OPENSCADDIR/patches/OpenCSG-$version-MacOSX-port.patch - MACOSX_DEPLOY_DIR=$DEPLOYDIR qmake -r CONFIG+="x86 x86_64" + OPENSCAD_LIBRARIES=$DEPLOYDIR qmake -r CONFIG+="x86 x86_64" make install } diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh index 2036e3b..e559cb8 100755 --- a/scripts/publish-macosx.sh +++ b/scripts/publish-macosx.sh @@ -7,7 +7,7 @@ VERSION=`date "+%Y.%m.%d"` PATH=${PATH//\/opt\/local\/libexec\/ccache:} # This is the same location as DEPLOYDIR in macosx-build-dependencies.sh -export MACOSX_DEPLOY_DIR=$PWD/../libraries/install +export OPENSCAD_LIBRARIES=$PWD/../libraries/install `dirname $0`/release-common.sh -v $VERSION if [[ $? != 0 ]]; then |