Changeset 23588

Timestamp:

2011-01-14T15:46:02+13:00 (13 years ago)

Author:

sjm84

Message:

Modifying wvWare to put its libraries into /data/sjm84/greenstone2-svn/lib/[linux|darwin] and also added this directory to the [DY]LD_LIBRARY_PATH when sourcing setup.bash

Location:

main/trunk/greenstone2

Files:

• build-src/packages/configure (modified) (2 diffs)
• setup.bash (modified) (2 diffs)

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

@@ -119 +119 @@
 ##fi
 
+libdir="${prefix}/lib/$GSDLOS"
+
 # This loads the top configure's cache file, with variables already set.
 if test -f "$cache_file" ; then
@@ -137 +139 @@
 # datadir is for default location of wvHtml.xml config file
 cd wv-gs && \
-./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS
+./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS
 
 # configure the pdftohtml converter

main/trunk/greenstone2/setup.bash

@@ -161 +161 @@
   export PATH
   
+  if test "$GSDLOS" = "linux" ; then
+      LD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS:$LD_LIBRARY_PATH"
+      export LD_LIBRARY_PATH
+  elif test "$GSDLOS" = "darwin" ; then
+      DYLD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS:$DYLD_LIBRARY_PATH"
+      export DYLD_LIBRARY_PATH
+  fi
  
   # Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables.
@@ -195 +202 @@
 fi
   
-  
+
   
   MANPATH=$MANPATH:$GSDLHOME/packages/mg/man