Changeset 36430 for main

Timestamp:

2022-08-22T15:17:05+12:00 (20 months ago)

Author:

davidb

Message:

Changes after further testing. Decision made to install libz (and header file) into the packages/openssl directory, as this is where wget is directed to, to look for additional libraries

File:

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

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

@@ -143 +143 @@
 # however, if the gnome-lib extension is off, this failes
 # => configure, compile up and install libz here
-
-
-# configure the pdftohtml converter
+# => co-opt the openssl directory for installation of libz
+#    as this is where wget is directed to look for additional libraries
+
+# configure the libz converter
 echo ""
 echo "Configuring libz"
@@ -153 +154 @@
 gzip -dc zlib-1.2.11.tar.gz | tar -xf -
 cd zlib-1.2.11 && \
-./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
+./configure $CACHE_FILE --static --prefix="$PACKAGES/openssl" $HOSTTARGETFLAGS $ENVIRONMENT
 
 if test x$? != x0 ;