Changeset 26565 for main/trunk/greenstone2/common-src/configure.in

Timestamp:

2012-12-10T13:40:53+13:00 (11 years ago)

Author:

ak19

Message:

Trying to get the mac release binary to install correctly again. It was generating a darwin32 subfolder inside the cgi-bin folder, but expecting a darwin subfolder instead. The svn version works and just generates darwin as a subfolder. Therefore, changed the test in common-src's configure.in to determine what the folder name should be based more literally on the comments. It used to find out whether the gsdlarch bit-value was to be used in naming gsdlos folders by testing whether a gsdlos subfolder existed in toplevel's bin. Now it performs the test by checking whether a gsdlos-gsdlarch subfolder exists in bin, and if not, just not using the gsdlarch variable in the naming scheme. Need to test it on release-kit after commit.

File:

• main/trunk/greenstone2/common-src/configure.in (modified) (1 diff)

main/trunk/greenstone2/common-src/configure.in

@@ -423 +423 @@
 # directories already or if common-src is compiled up on its own.
 # E.g. 32/64 bit won't be used in the SVN version if only bin/linux exists.
-if test -d "../bin/$gsdlos" -o ! -f "../setup.bash" ; then
+if test ! -d "../bin/$gsdlos$gsdlarch" -o ! -f "../setup.bash" ; then
    gsdlarch=""
 fi