Changeset 21624

Show
Ignore:
Timestamp:
26.01.2010 13:17:21 (9 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/configure

    r21534 r21624  
    27222722fi 
    27232723 
     2724 
     2725# Determine the OS we're running on, and set the --bindir option appropriately 
     2726gsdlos=`uname | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` 
     2727if test "`echo $gsdlos | sed 's/cygwin//'`" != "$gsdlos" ; then 
     2728  # Cygwin 
     2729  gsdlos=windows 
     2730fi 
     2731ac_configure_args="$ac_configure_args --bindir=`pwd`/bin/$gsdlos" 
    27242732 
    27252733# Configure the common-src subdirectory 
  • main/trunk/gs2-core/configure.ac

    r21542 r21624  
    6767AM_CONDITIONAL(USE_SQLITE, test "x$enable_sqlite" != xno) 
    6868 
     69# Determine the OS we're running on, and set the --bindir option appropriately 
     70gsdlos=`uname | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` 
     71if test "`echo $gsdlos | sed 's/cygwin//'`" != "$gsdlos" ; then 
     72  # Cygwin   
     73  gsdlos=windows 
     74fi 
     75ac_configure_args="$ac_configure_args --bindir=`pwd`/bin/$gsdlos" 
     76 
    6977# Configure the common-src subdirectory 
    7078if test -d "$srcdir/common-src"; then