Changeset 21624 for main/trunk/gs2-core

Timestamp:

2010-01-26T13:17:21+13:00 (14 years ago)

Author:

mdewsnip

Message:

Added code to set the --bindir option when configuring subdirectories, so the binaries (eg. sqlite3) are put in the right place.

Location:

main/trunk/gs2-core

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)

main/trunk/gs2-core/configure

@@ -2722 +2722 @@
 fi
 
+
+# Determine the OS we're running on, and set the --bindir option appropriately
+gsdlos=`uname | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+if test "`echo $gsdlos | sed 's/cygwin//'`" != "$gsdlos" ; then
+  # Cygwin
+  gsdlos=windows
+fi
+ac_configure_args="$ac_configure_args --bindir=`pwd`/bin/$gsdlos"
 
 # Configure the common-src subdirectory

main/trunk/gs2-core/configure.ac

@@ -67 +67 @@
 AM_CONDITIONAL(USE_SQLITE, test "x$enable_sqlite" != xno)
 
+# Determine the OS we're running on, and set the --bindir option appropriately
+gsdlos=`uname | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+if test "`echo $gsdlos | sed 's/cygwin//'`" != "$gsdlos" ; then
+  # Cygwin  
+  gsdlos=windows
+fi
+ac_configure_args="$ac_configure_args --bindir=`pwd`/bin/$gsdlos"
+
 # Configure the common-src subdirectory
 if test -d "$srcdir/common-src"; then