Changeset 32494 for main

Show
Ignore:
Timestamp:
25.09.2018 20:31:03 (8 months 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/packages/Makefile

    r32492 r32494  
    3232# build-src/packages/configure. make clean and make distclean happen here. 
    3333 
    34 # For darwin, the end of make all will also cascade-make the Crypt::LE perl 
     34# For darwin, the end of make install will also cascade-make the Crypt::LE perl 
    3535# package (configure-compile-install all its dependencies and Crypt::LE too) 
    3636# used for https certification on macs. 
    3737# Likewise, at make clean's end, clean is also run on Crypt::LE, uninstalling it. 
     38# Building process of Crypt::LE is dependent on wget being installed, 
     39# so have to do it at end of make install, rather than at end of make all. 
    3840 
    3941PACKAGEDIRS =  
     
    6163          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    6264        done 
    63     if [[ "x$(GSDLOS)" = "xdarwin" ]]; then \ 
    64       (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \ 
    65     fi 
    6665 
    6766install: 
     
    7069          (cd $$idir && $(MAKE) install) || exit 1; \ 
    7170        done 
     71    if [[ "x$(GSDLOS)" = "xdarwin" ]]; then \ 
     72      (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \ 
     73    fi 
    7274 
    7375clean: 
  • main/trunk/greenstone2/build-src/packages/Makefile.in

    r32492 r32494  
    3232# build-src/packages/configure. make clean and make distclean happen here. 
    3333 
    34 # For darwin, the end of make all will also cascade-make the Crypt::LE perl 
     34# For darwin, the end of make install will also cascade-make the Crypt::LE perl 
    3535# package (configure-compile-install all its dependencies and Crypt::LE too) 
    3636# used for https certification on macs. 
    3737# Likewise, at make clean's end, clean is also run on Crypt::LE, uninstalling it. 
     38# Building process of Crypt::LE is dependent on wget being installed, 
     39# so have to do it at end of make install, rather than at end of make all. 
    3840 
    3941PACKAGEDIRS =  
     
    6163          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    6264        done 
    63     if [[ "x$(GSDLOS)" = "xdarwin" ]]; then \ 
    64       (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \ 
    65     fi 
    6665 
    6766install: 
     
    7069          (cd $$idir && $(MAKE) install) || exit 1; \ 
    7170        done 
     71    if [[ "x$(GSDLOS)" = "xdarwin" ]]; then \ 
     72      (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \ 
     73    fi 
    7274 
    7375clean: