Changeset 32494 for main

Timestamp:

2018-09-25T20:31:03+12:00 (6 years ago)

Author:

ak19

Message:

Can't compile Crypt::LE at end of make all in build-src/packages, as Crypt::LE is dependent on wget being installed. So have to build Crypt::LE after wget (and hence other build-src/packages) have been installed. Therefore now attempting to build Crypt::LE at the end of build-src/packages' make install target.

Location:

main/trunk/greenstone2/build-src/packages

Files:

• Makefile (modified) (3 diffs)
• Makefile.in (modified) (3 diffs)

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

@@ -32 +32 @@
 # build-src/packages/configure. make clean and make distclean happen here.
 
-# For darwin, the end of make all will also cascade-make the Crypt::LE perl
+# For darwin, the end of make install will also cascade-make the Crypt::LE perl
 # package (configure-compile-install all its dependencies and Crypt::LE too)
 # used for https certification on macs.
 # Likewise, at make clean's end, clean is also run on Crypt::LE, uninstalling it.
+# Building process of Crypt::LE is dependent on wget being installed,
+# so have to do it at end of make install, rather than at end of make all.
 
 PACKAGEDIRS = 
@@ -61 +63 @@
           (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
         done
-    if [[ "x$(GSDLOS)" = "xdarwin" ]]; then \
-      (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \
-    fi
 
 install:
@@ -70 +69 @@
           (cd $$idir && $(MAKE) install) || exit 1; \
         done
+    if [[ "x$(GSDLOS)" = "xdarwin" ]]; then \
+      (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \
+    fi
 
 clean:

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

@@ -32 +32 @@
 # build-src/packages/configure. make clean and make distclean happen here.
 
-# For darwin, the end of make all will also cascade-make the Crypt::LE perl
+# For darwin, the end of make install will also cascade-make the Crypt::LE perl
 # package (configure-compile-install all its dependencies and Crypt::LE too)
 # used for https certification on macs.
 # Likewise, at make clean's end, clean is also run on Crypt::LE, uninstalling it.
+# Building process of Crypt::LE is dependent on wget being installed,
+# so have to do it at end of make install, rather than at end of make all.
 
 PACKAGEDIRS = 
@@ -61 +63 @@
           (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
         done
-    if [[ "x$(GSDLOS)" = "xdarwin" ]]; then \
-      (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \
-    fi
 
 install:
@@ -70 +69 @@
           (cd $$idir && $(MAKE) install) || exit 1; \
         done
+    if [[ "x$(GSDLOS)" = "xdarwin" ]]; then \
+      (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \
+    fi
 
 clean: