per-distro makefile improvments

1. install soap-lite as a deb before CPAN runs.
   Business::OnlinePayment::PayPal fails otherwise.

2. by default, use apt-get as the APT tool, since all debian distros have
   this

3. move 'install_yaz' directly into Makefile.ubuntu-lucid, since that's
  the only OS which uses it.

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common
index 5db0e63..efd52d3 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.common
+++ b/Open-ILS/src/extras/install/Makefile.common
@@ -1,10 +1,5 @@
 # Functions used by all installers
 
-# We need a recent version of Yaz
-# Ubuntu 10.04 comes with 3.0.52
-YAZ=yaz-4.2.32
-YAZ_HOST=http://ftp.indexdata.dk/pub/yaz
-
 # Install the CPAN modules
 install_cpan:
        for m in $(CPAN_MODULES); do perl -MCPAN -e "install \"$$m\";"; done
@@ -37,10 +32,4 @@ clean:
        make -C $(LIBDBI_DRIVERS) clean
        make -C $(LIBJS_PERL) clean
 
-# Install a known working version of YAZ
-install_yaz:    
-       if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi;
-       tar xzf $(YAZ).tar.gz
-       cd $(YAZ) && ./configure && make && make install && ldconfig
-
 # vim:noet:sw=4:ts=4:

diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian
index aa4d065..892569b 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian
+++ b/Open-ILS/src/extras/install/Makefile.debian
@@ -1,7 +1,6 @@
 # actions required by all debian-based OSs
 
-# is this OS-specific?
-APT_TOOL=aptitude -yq
+APT_TOOL=apt-get -yq
 
 install_debs:
        $(APT_TOOL) install $(DEBS)

diff --git a/Open-ILS/src/extras/install/Makefile.debian-squeeze b/Open-ILS/src/extras/install/Makefile.debian-squeeze
index f4c89fd..567cfd5 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-squeeze
+++ b/Open-ILS/src/extras/install/Makefile.debian-squeeze
@@ -47,6 +47,7 @@ export DEBS = \
        libunix-syslog-perl\
     libuuid-tiny-perl\
        libyaz-dev\
+       libsoap-lite-perl\
        yaz
 
 export DEB_APACHE_MODS = \

diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy
index 2d6bd17..2f8cfe7 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-wheezy
+++ b/Open-ILS/src/extras/install/Makefile.debian-wheezy
@@ -52,6 +52,7 @@ export DEBS = \
     libuuid-tiny-perl\
        libyaz-dev\
        postgresql-client-9.1\
+       libsoap-lite-perl\
        yaz
 
 export DEB_APACHE_MODS = \

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
index 80d2b3c..3ec6122 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
@@ -3,6 +3,11 @@
 DIR = $(dir $(lastword $(MAKEFILE_LIST)))
 APT_SAFE_TOOL = aptitude -P
 
+# We need a recent version of Yaz
+# Ubuntu 10.04 comes with 3.0.52
+YAZ=yaz-4.2.32
+YAZ_HOST=http://ftp.indexdata.dk/pub/yaz
+
 export DEBS = \
        apache2-prefork-dev\
        aspell\
@@ -42,6 +47,7 @@ export DEBS = \
        libuniversal-require-perl\
        libunix-syslog-perl\
     libuuid-tiny-perl\
+       libsoap-lite-perl\
        libyaz-dev\
 
 export DEB_APACHE_MODS = \
@@ -79,6 +85,12 @@ PGSQL_CLIENT_DEBS_91 = \
        libpq-dev \
        postgresql-client-9.1
 
+# Install a known working version of YAZ
+install_yaz:    
+       if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi;
+       tar xzf $(YAZ).tar.gz
+       cd $(YAZ) && ./configure && make && make install && ldconfig
+
 all:
        make -f $(DIR)/Makefile.debian install_debs
        make -f $(DIR)/Makefile.debian test_for_libdbi_pkg

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-precise b/Open-ILS/src/extras/install/Makefile.ubuntu-precise
index 96881a3..1b0d391 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-precise
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-precise
@@ -54,6 +54,7 @@ export DEBS = \
        libuuid-tiny-perl\
        libyaz-dev\
        postgresql-client-9.1\
+       libsoap-lite-perl\
        yaz
 
 export DEB_APACHE_MODS = \