Clifford Wolf:

	Fixed linux release scripts for libraries
	Improved libraries and examples dir search order for linux



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

2 files changed, 16 insertions, 10 deletions

diff --git a/scripts/release-linux.sh b/scripts/release-linux.sh
index 5ee6147..edb79eb 100755
--- a/scripts/release-linux.sh
+++ b/scripts/release-linux.sh
@@ -11,7 +11,7 @@ qmake-qt4 VERSION=$VERSION
 make
 
 rm -rf release
-mkdir -p release/{bin,lib/openscad,examples}
+mkdir -p release/{bin,lib/openscad,examples,libraries}
 
 cat > release/bin/openscad << "EOT"
 #!/bin/bash
@@ -39,7 +39,7 @@ cat > release/install.sh << "EOT"
 # change to the install source directory
 cd "$( dirname "$( type -p $0 )" )"
 
-if ! [ -f bin/openscad -a -d lib/openscad -a -d examples ]; then
+if ! [ -f bin/openscad -a -d lib/openscad -a -d examples -a -d libraries ]; then
 	echo "Error: Can't change to install source directory!" >&2
 	exit 1
 fi
@@ -58,7 +58,7 @@ if [ ! -d "$prefix" ]; then
 	read -p "press enter to continue> "
 fi
 
-mkdir -p "$prefix"/{bin,lib/openscad,share/openscad/examples}
+mkdir -p "$prefix"/{bin,lib/openscad,share/openscad/examples,share/openscad/libraries}
 
 if ! [ -w "$prefix"/bin/ -a -w "$prefix"/lib/openscad -a -w "$prefix"/share/openscad ]; then
 	echo "You does not seam to have write permissions for prefix \`$prefix'!" >&2
@@ -69,12 +69,15 @@ fi
 echo "Copying application wrappers..."
 cp -rv bin/. "$prefix"/bin/
 
-echo "Copying application and libraries..."
+echo "Copying application..."
 cp -rv lib/. "$prefix"/lib/
 
 echo "Copying examples..."
 cp -rv examples/. "$prefix"/share/openscad/examples/
 
+echo "Copying libraries..."
+cp -rv libraries/. "$prefix"/share/openscad/libraries/
+
 echo "Installation finished. Have a nice day."
 EOT
 
@@ -83,3 +86,6 @@ chmod 755 -R release/
 cp examples/* release/examples/
 chmod 644 -R release/examples/*
 
+cp libraries/* release/libraries/
+chmod 644 -R release/libraries/*
+
diff --git a/src/openscad.cc b/src/openscad.cc
index 3cf719b..37c0294 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -170,15 +170,15 @@ int main(int argc, char **argv)
 	exdir.cd("../Resources"); // Examples can be bundled
 	if (!exdir.exists("examples")) exdir.cd("../../..");
 #elif defined(Q_OS_UNIX)
-	if (exdir.cd("../../examples")) {
-		examplesdir = exdir.path();
-	} else
 	if (exdir.cd("../share/openscad/examples")) {
 		examplesdir = exdir.path();
 	} else
 	if (exdir.cd("../../share/openscad/examples")) {
 		examplesdir = exdir.path();
 	} else
+	if (exdir.cd("../../examples")) {
+		examplesdir = exdir.path();
+	} else
 #endif
 	if (exdir.cd("examples")) {
 		examplesdir = exdir.path();
@@ -189,15 +189,15 @@ int main(int argc, char **argv)
 	libdir.cd("../Resources"); // Libraries can be bundled
 	if (!libdir.exists("libraries")) libdir.cd("../../..");
 #elif defined(Q_OS_UNIX)
-	if (libdir.cd("../../libraries")) {
-		librarydir = libdir.path();
-	} else
 	if (libdir.cd("../share/openscad/libraries")) {
 		librarydir = libdir.path();
 	} else
 	if (libdir.cd("../../share/openscad/libraries")) {
 		librarydir = libdir.path();
 	} else
+	if (libdir.cd("../../libraries")) {
+		librarydir = libdir.path();
+	} else
 #endif
 	if (libdir.cd("libraries")) {
 		librarydir = libdir.path();