From 419e8900fcb274f99606fe9cbeb4298e957c3efc Mon Sep 17 00:00:00 2001
From: kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c>
Date: Wed, 31 Mar 2010 14:47:43 +0000
Subject: Install CGAL in a version-tagged directory

git-svn-id: http://svn.clifford.at/openscad/trunk@499 b57f626f-c46c-0410-a088-ec61d464b74c

diff --git a/doc/checklist-macosx.txt b/doc/checklist-macosx.txt
index b88a63c..6db2033 100644
--- a/doc/checklist-macosx.txt
+++ b/doc/checklist-macosx.txt
@@ -11,7 +11,7 @@ o Build CGAL >= 3.5
 
   tar xzf CGAL-3.6.tar.gz
   cd CGAL-3.6
-  cmake -DCMAKE_INSTALL_PREFIX=$PWD/../install -DBUILD_SHARED_LIBS=FALSE
+  cmake -DCMAKE_INSTALL_PREFIX=$PWD/../install/CGAL-3.6 -DBUILD_SHARED_LIBS=FALSE
   make -j4
   make install
 
diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh
index 399080e..3f14837 100755
--- a/scripts/publish-macosx.sh
+++ b/scripts/publish-macosx.sh
@@ -4,7 +4,7 @@ VERSION=`date "+%Y.%m.%d"`
 #VERSION=2010.02
 
 export OPENCSGDIR=$PWD/../OpenCSG-1.3.0
-export CGALDIR=$PWD/../install
+export CGALDIR=$PWD/../install/CGAL-3.6
 export EIGEN2DIR=/opt/local/include/eigen2
 
 `dirname $0`/release-common.sh -v $VERSION
diff --git a/setenv_mjau.sh b/setenv_mjau.sh
index 2188687..978d73e 100644
--- a/setenv_mjau.sh
+++ b/setenv_mjau.sh
@@ -1,3 +1,3 @@
 export OPENCSGDIR=$PWD/../OpenCSG-1.3.0
-export CGALDIR=$PWD/../install
+export CGALDIR=$PWD/../install/CGAL-3.6
 export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib:$QCODEEDITDIR/lib
-- 
cgit v0.10.1