Changeset 31830 for main/trunk/greenstone2/build-src/packages/Makefile.in

Timestamp:

2017-07-28T19:26:50+12:00 (7 years ago)

Author:

ak19

Message:

Next working incremental commit. Wget doesn't need openssl libraries to run, since wget is built against statically-compiled up openssl. So openssl doesn't need to live in gs2build/bin/linux, but can be built in build-src/packages/openssl where it's extracted and compiled and needn't be included in the library.

File:

• main/trunk/greenstone2/build-src/packages/Makefile.in (modified) (2 diffs)

main/trunk/greenstone2/build-src/packages/Makefile.in

@@ -43 +43 @@
         xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy
 OPENSSL_PKG = openssl/openssl-1.0.2l
+# When doing make clean, remove OpenSSL products too
+OPENSSL_PRODUCTS = certs man misc private openssl.cnf
+# The key OpenSSL products bin, include, lib folders no longer live in
+# gs2build/bin/linux, but in the same location as the rest, so add that:
+OPENSSL_PRODUCTS += bin include lib
 
 all:
@@ -67 +72 @@
           (cd $$subdir && $(MAKE) distclean || exit 0) ; \
         done
-    (cd openssl && rm -rf certs man misc private openssl.cnf || exit 0)
+    (cd openssl && rm -rf $(OPENSSL_PRODUCTS) || exit 0)
     rm -rf $(OPENSSL_PKG)