Changeset 22391

Show
Ignore:
Timestamp:
14.07.2010 10:49:19 (10 years ago)
Author:
sjm84
Message:

Tidied up this configuration file and fix some minor problems

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/packages/configure

    r22378 r22391  
    140140fi 
    141141 
    142 #Configure and compile 32-bit expat 
     142cd "$PACKAGES/expat/expat-1.95.8" 
     143 
    143144if test -e Makefile ; then 
    144145  echo make distclean && \ 
     
    146147fi 
    147148 
     149#Configure and compile 32-bit expat 
    148150echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 
    149  
    150 cd "$PACKAGES/expat/expat-1.95.8" && \ 
    151151CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 
    152152 
     
    161161 
    162162if test ! -z "$COMPAT32BITFLAGS" ; then 
    163 #Configure and compile 64-bit expat 
     163  echo "Generating native 64-bit version of expat" 
     164  #Configure and compile 64-bit expat 
    164165  echo ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 
    165  
    166   cd "$PACKAGES/expat/expat-1.95.8" && \ 
    167166  ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 
    168167 
     
    172171  echo make install $ENVIRONMENT 
    173172  make install $ENVIRONMENT 
    174 fi 
    175  
    176 echo make distclean && \ 
    177 make distclean 
     173   
     174  echo make distclean && \ 
     175  make distclean 
     176fi 
    178177 
    179178# configure and compile libiconv during configuration stage 
     
    187186fi 
    188187 
    189 # configure 
    190188cd "$PACKAGES/iconv/libiconv-1.13.1" 
    191189 
     
    195193fi 
    196194 
     195# configure 
    197196echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 
    198  
    199197CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 
    200198