Changeset 22391 for main/trunk/greenstone2/common-src/packages/configure

Timestamp:

2010-07-14T10:49:19+12:00 (14 years ago)

Author:

sjm84

Message:

Tidied up this configuration file and fix some minor problems

File:

• main/trunk/greenstone2/common-src/packages/configure (modified) (6 diffs)

main/trunk/greenstone2/common-src/packages/configure

@@ -140 +140 @@
 fi
 
-#Configure and compile 32-bit expat
+cd "$PACKAGES/expat/expat-1.95.8"
+
 if test -e Makefile ; then
   echo make distclean && \
@@ -146 +147 @@
 fi
 
+#Configure and compile 32-bit expat
 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
-
-cd "$PACKAGES/expat/expat-1.95.8" && \
 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
 
@@ -161 +161 @@
 
 if test ! -z "$COMPAT32BITFLAGS" ; then
-#Configure and compile 64-bit expat
+  echo "Generating native 64-bit version of expat"
+  #Configure and compile 64-bit expat
   echo ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
-
-  cd "$PACKAGES/expat/expat-1.95.8" && \
   ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
 
@@ -172 +171 @@
   echo make install $ENVIRONMENT
   make install $ENVIRONMENT
-fi
-
-echo make distclean && \
-make distclean
+  
+  echo make distclean && \
+  make distclean
+fi
 
 # configure and compile libiconv during configuration stage
@@ -187 +186 @@
 fi
 
-# configure
 cd "$PACKAGES/iconv/libiconv-1.13.1"
 
@@ -195 +193 @@
 fi
 
+# configure
 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
-
 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT