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

Timestamp:

2017-07-28T18:53:37+12:00 (7 years ago)

Author:

ak19

Message:

Intermediate commit for building wget with openssl. This is a working version, part of incremental commits. For now, we're still using wget-1.15-gs (that always requires --no-check-certificate if running wget), which now uses a wgetrc conf file to turn off the check-certificate default of wget, since without this, wget fails getting https pages that don't yet have a valid security certificate. This commit introduces the template wgetrc-gs.in file, which contains a flag set to not require certificate checks, is copied to gs2build/OS as wgetrc. The WGETRC env var is set in setup.bash to point to the wgetrc file so wget runs smoothly against https urls.

File:

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

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

@@ -29 +29 @@
 # is assumed that each package will have at least four rules: all, install,
 # clean, and distclean.
+# openssl is configured and compiled during the configure stage by
+# build-src/packages/configure. make clean and make distclean happen here.
 
 PACKAGEDIRS = 
@@ -40 +42 @@
         wget/wget-1.15-gs cpan/XML-Parser-2.41 \
         xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy
+OPENSSL_PKG = openssl/openssl-1.0.2l
 
 all:
@@ -54 +57 @@
 
 clean:
-    for subdir in $(PACKAGEDIRS); do \
+    for subdir in $(PACKAGEDIRS) $(OPENSSL_PKG); do \
           echo cleaning $@ in $$subdir; \
           (cd $$subdir && $(MAKE) clean || exit 0) ; \
@@ -60 +63 @@
 
 distclean:
-    for subdir in $(PACKAGEDIRS); do \
+    for subdir in $(PACKAGEDIRS) $(OPENSSL_PKG); do \
           echo cleaning $@ in $$subdir; \
           (cd $$subdir && $(MAKE) distclean || exit 0) ; \
         done
+    (cd openssl && rm -rf certs man misc private openssl.cnf || exit 0)
+    rm -rf $(OPENSSL_PKG)