Changeset 30866

Show
Ignore:
Timestamp:
14.10.2016 20:41:32 (3 years ago)
Author:
ak19
Message:

GSDLOS variable wasn't being set in configure.in and hence wasn't propagating into mgpp/jni and mgpp/text, and the jni/Makefile.in wasn;t making reference to it either.

Location:
main/trunk/greenstone2/common-src/indexers/mgpp
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/mgpp/configure.in

    r26656 r30866  
    1616AC_SUBST(PACKAGE) 
    1717AC_SUBST(VERSION) 
     18 
     19gsdlos=`uname | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` 
     20# check for running bash under cygwin 
     21 if test "`echo $gsdlos | sed 's/cygwin//'`" != "$gsdlos" ; 
     22 then 
     23  gsdlos=windows 
     24 fi 
     25if test "x$crossOS" != "x" ; then 
     26  gsdlos=$crossOS 
     27  gsdlarch="" 
     28fi 
     29AC_SUBST(gsdlos) 
    1830 
    1931dnl 
  • main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

    r30863 r30866  
    3434INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    3535LDFLAGS = @LDFLAGS@ @ARCH_DEP_FLAGS@ 
     36GSDLOS = @gsdlos@ 
    3637#NOTE: libmgpptext.a needs to come before libmgpplib.a !!! 
    3738