Changeset 23773 for main/trunk/greenstone2

Timestamp:

2011-03-14T12:48:26+13:00 (13 years ago)

Author:

sjm84

Message:

Undid the change libdir change

File:

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

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

@@ -125 +125 @@
 ##fi
 
-libdir="${prefix}/lib/$GSDLOS"
+#libdir="${prefix}/lib/$GSDLOS"
 
 # This loads the top configure's cache file, with variables already set.
@@ -321 +321 @@
   fi
 
-  echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT --libdir="$libdir"
+  echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
 
   cd "$PACKAGES/sqlite/sqlite-amalgamation-3.6.23.1" && \
-  CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT --libdir="$libdir"
+  CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
 else
   echo "SQLite support disabled."