[open-ils-commits] [GIT] Evergreen ILS branch master updated. 3e7cbfa71cef994682bdf73b281298aa448bb388

Evergreen Git git at git.evergreen-ils.org
Tue Aug 20 14:52:46 EDT 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  3e7cbfa71cef994682bdf73b281298aa448bb388 (commit)
       via  2f8bd75e12a59241637ca739ba1d0c9908c80fc6 (commit)
       via  8b90537c05c4febdb02dc4fcc3a5ddd818e7d9e8 (commit)
       via  f97334dcc9439fbab0f73a9aeed1ef0001da3fc2 (commit)
       via  a3c338f9417611e9116616472ca7ce3bec0ca75b (commit)
       via  c4f884b453f72b336ee9652f475e940b2d265ebd (commit)
       via  a9558065ad54fd17891dbc444d7ade8059cd9a85 (commit)
      from  a2078f2213a2450abdf49e2966af75db5d764ebf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3e7cbfa71cef994682bdf73b281298aa448bb388
Author: Dan Scott <dscott at laurentian.ca>
Date:   Tue Aug 20 13:02:23 2013 -0400

    Fedora: remove source installs for packaged dependencies
    
    The Perl MARC packages, Library::CallNumber::LC, and libdbi / libdbd
    drivers have been available as packages on Fedora since Fedora 18 (which
    is now the oldest supported Fedora version), so don't install these from
    source.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/extras/install/Makefile.fedora b/Open-ILS/src/extras/install/Makefile.fedora
index 37d3f06..91363cb 100644
--- a/Open-ILS/src/extras/install/Makefile.fedora
+++ b/Open-ILS/src/extras/install/Makefile.fedora
@@ -38,16 +38,19 @@ FEDORA_RPMS = \
 	perl-Locale-Codes \
 	perl-MARC-Charset \
 	perl-MARC-Record \
+	perl-MARC-XML \
 	perl-Module-Pluggable \
 	perl-Net-IP \
 	perl-Net-SSH2 \
 	perl-OLE-Storage_Lite \
 	perl-RPC-XML \
+	perl-SOAP-Lite \
 	perl-Spreadsheet-WriteExcel \
 	perl-Test-Warn \
 	perl-Text-Aspell \
 	perl-Text-CSV \
 	perl-Text-CSV_XS \
+	perl-UUID-Tiny \
 	perl-XML-Writer \
 	postgresql-devel \
 	readline-devel \
@@ -56,32 +59,17 @@ FEDORA_RPMS = \
 	yaz
 
 export CPAN_MODULES = \
-	MARC::Record \
-	Business::ISBN \
-	Business::ISBN::Data \
-	MARC::Charset \
-	MARC::File::XML \
 	Net::Z3950::ZOOM \
-	Library::CallNumber::LC \
 	Net::Z3950::Simple2ZOOM \
 	Template::Plugin::POSIX \
 	SRU \
 	Rose::URI
 
 export CPAN_MODULES_FORCE = \
-	Class::DBI::Frozen::301
-
-# Note: B:O:AuthorizeNet 3.21 fails with https://rt.cpan.org/Public/Bug/Display.html?id=55172
-# Should be fixed in 3.22
-# MARC::Record 2.0.1+ is required but only 2.0.0 is packaged
-#
-# TODO: can contents of FEDORA_CPAN be moved into CPAN_MODULES_FORCE?
-FEDORA_CPAN = \
+	Class::DBI::Frozen::301 \
 	Business::OnlinePayment \
 	Business::OnlinePayment::AuthorizeNet \
-	Business::OnlinePayment::PayPal \
-	MARC::File::XML \
-	UUID::Tiny
+	Business::OnlinePayment::PayPal
 
 PGSQL_FEDORA_RPMS = \
 	postgresql \
@@ -90,11 +78,10 @@ PGSQL_FEDORA_RPMS = \
 	postgresql-plperl \
 	postgresql-server
 
-all: install_fedora_rpms install_cpan_fedora install_js_sm
+all: install_fedora_rpms install_js_sm
 	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
 	make -f $(DIR)/Makefile.common install_cpan
 	make -f $(DIR)/Makefile.common install_cpan_force
-	make -f $(DIR)/Makefile.common install_libdbi
 
 install_postgres_server:
 	yum -y install $(PGSQL_FEDORA_RPMS)
@@ -103,14 +90,6 @@ install_fedora_rpms:
 	yum -y update
 	yum -y install $(FEDORA_RPMS)
 
-install_cpan_fedora: 
-	for m in $(FEDORA_CPAN); do \
-		echo "force install $$m" | perl -MCPAN -e shell;\
-	done
-
-install_cpan_marc: install_cpan_marc_record
-	for m in $(CPAN_MODULES_MARC); do perl -MCPAN -e "install \"$$m\";"; done
-
 install_js_sm: install_libjs install_spidermonkey
 
 install_libjs: 

commit 2f8bd75e12a59241637ca739ba1d0c9908c80fc6
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Aug 19 11:23:14 2013 -0400

    LP 1190279 Modularize Makefile.install fedora target
    
    make -f Makefile.install fedora
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/install/Makefile.fedora b/Open-ILS/src/extras/install/Makefile.fedora
new file mode 100644
index 0000000..37d3f06
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.fedora
@@ -0,0 +1,147 @@
+# install files for Fedora
+
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+
+# Fedora?
+FEDORA=$(shell uname -r | grep "\.fc[0-9][0-9]\.")
+# Fedora 64-bit?
+FEDORA_64=$(shell uname -r | grep "\.fc[0-9][0-9]\.x86_64")
+
+FEDORA_RPMS = \
+	aspell \
+	aspell-en \
+	bzip2-devel \
+	check \
+	check-devel \
+	libdbi \
+	libdbi-dbd-pgsql \
+	libdbi-devel \
+	libssh2-devel \
+	libyaz \
+	libyaz-devel \
+	mingw32-nsiswrapper \
+	mod_ssl \
+	ncurses-devel \
+	ncurses-libs \
+	perl-parent \
+	perl-Business-CreditCard \
+	perl-Business-ISBN \
+	perl-Business-ISBN-Data \
+	perl-CPAN \
+	perl-DBD-Pg \
+	perl-Email-Send \
+	perl-Email-Simple \
+	perl-GDGraph3d \
+	perl-JSON-XS \
+	perl-LDAP \
+	perl-Library-CallNumber-LC \
+	perl-Locale-Codes \
+	perl-MARC-Charset \
+	perl-MARC-Record \
+	perl-Module-Pluggable \
+	perl-Net-IP \
+	perl-Net-SSH2 \
+	perl-OLE-Storage_Lite \
+	perl-RPC-XML \
+	perl-Spreadsheet-WriteExcel \
+	perl-Test-Warn \
+	perl-Text-Aspell \
+	perl-Text-CSV \
+	perl-Text-CSV_XS \
+	perl-XML-Writer \
+	postgresql-devel \
+	readline-devel \
+	tcp_wrappers-devel \
+	wget \
+	yaz
+
+export CPAN_MODULES = \
+	MARC::Record \
+	Business::ISBN \
+	Business::ISBN::Data \
+	MARC::Charset \
+	MARC::File::XML \
+	Net::Z3950::ZOOM \
+	Library::CallNumber::LC \
+	Net::Z3950::Simple2ZOOM \
+	Template::Plugin::POSIX \
+	SRU \
+	Rose::URI
+
+export CPAN_MODULES_FORCE = \
+	Class::DBI::Frozen::301
+
+# Note: B:O:AuthorizeNet 3.21 fails with https://rt.cpan.org/Public/Bug/Display.html?id=55172
+# Should be fixed in 3.22
+# MARC::Record 2.0.1+ is required but only 2.0.0 is packaged
+#
+# TODO: can contents of FEDORA_CPAN be moved into CPAN_MODULES_FORCE?
+FEDORA_CPAN = \
+	Business::OnlinePayment \
+	Business::OnlinePayment::AuthorizeNet \
+	Business::OnlinePayment::PayPal \
+	MARC::File::XML \
+	UUID::Tiny
+
+PGSQL_FEDORA_RPMS = \
+	postgresql \
+	postgresql-contrib \
+	postgresql-libs \
+	postgresql-plperl \
+	postgresql-server
+
+all: install_fedora_rpms install_cpan_fedora install_js_sm
+	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
+	make -f $(DIR)/Makefile.common install_cpan
+	make -f $(DIR)/Makefile.common install_cpan_force
+	make -f $(DIR)/Makefile.common install_libdbi
+
+install_postgres_server:
+	yum -y install $(PGSQL_FEDORA_RPMS)
+
+install_fedora_rpms:
+	yum -y update
+	yum -y install $(FEDORA_RPMS)
+
+install_cpan_fedora: 
+	for m in $(FEDORA_CPAN); do \
+		echo "force install $$m" | perl -MCPAN -e shell;\
+	done
+
+install_cpan_marc: install_cpan_marc_record
+	for m in $(CPAN_MODULES_MARC); do perl -MCPAN -e "install \"$$m\";"; done
+
+install_js_sm: install_libjs install_spidermonkey
+
+install_libjs: 
+	if [ ! -f $(LIBJS).tar.gz ]; then wget $(LIBJS_URL); fi;
+	tar -zxf $(LIBJS).tar.gz
+	cd js/src/ && JS_DIST=/usr make -f Makefile.ref
+	mkdir -p $(JS_INSTALL_PREFIX)/include/js/
+	cp js/src/*.h $(JS_INSTALL_PREFIX)/include/js/
+	cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/
+	if [ ! -z $(FEDORA_64) ]; then \
+		cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib64/ && \
+		cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib64/; \
+	else \
+		cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/ && \
+		cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/; \
+	fi;
+	ldconfig
+
+install_spidermonkey:
+	if [ ! -f $(LIBJS_PERL).tar.gz ]; then wget $(LIBJS_PERL_URL); fi;
+	tar -zxf $(LIBJS_PERL).tar.gz
+	if [ ! -z $(FEDORA_64) ]; then \
+		sed -i -e 's/"\/usr\/lib"/"\/usr\/lib64"/' $(LIBJS_PERL)/Makefile.PL ; \
+	fi;
+	if [ ! -z $(FEDORA) ]; then \
+		sed -i -e 's/js32.dll/libjs.so/' $(LIBJS_PERL)/Makefile.PL ; \
+	fi;
+	cd $(LIBJS_PERL) && perl Makefile.PL -E4X && make && make test && make install
+
+
+clean:
+	make -f $(DIR)/Makefile.common clean
+
+# vim:noet:sw=4:ts=4:

commit 8b90537c05c4febdb02dc4fcc3a5ddd818e7d9e8
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Aug 19 12:16:43 2013 -0400

    LP 1190279 libtest-warn-perl for ubuntu targets
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
index 97783a4..eb00b54 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
@@ -48,6 +48,7 @@ export DEBS = \
 	libunix-syslog-perl\
     libuuid-tiny-perl\
 	libbz2-dev\
+	libtest-warn-perl\
 	libsoap-lite-perl
 
 export DEB_APACHE_MODS = \
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-precise b/Open-ILS/src/extras/install/Makefile.ubuntu-precise
index 1b0d391..72a23af 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-precise
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-precise
@@ -55,6 +55,7 @@ export DEBS = \
 	libyaz-dev\
 	postgresql-client-9.1\
 	libsoap-lite-perl\
+	libtest-warn-perl\
 	yaz
 
 export DEB_APACHE_MODS = \

commit f97334dcc9439fbab0f73a9aeed1ef0001da3fc2
Author: Bill Erickson <berick at esilibrary.com>
Date:   Tue Jul 9 11:43:47 2013 -0400

    LP 1190279 Modularize Makefile.install misc. repairs
    
    apply missing install_libdbi for wheezy/squeeze
    
    Added libtest-warn-perl prereq for wheezy/squeeze
    
    per-distro makefile improvments
    
    install soap-lite as a deb before CPAN runs.
       Business::OnlinePayment::PayPal fails otherwise.
    
    by default, use apt-get as the APT tool, since all debian distros have
       this
    
    move 'install_yaz' directly into Makefile.ubuntu-lucid, since that's
      the only OS which uses it.
    
    Squeeze also needs an updated yaz; Yaz-related repairs
    
    give debians and lucid libbz2-dev; precise has it already
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common
index 5db0e63..efd52d3 100644
--- 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
--- 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 f87712b..3bc586a 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-squeeze
+++ b/Open-ILS/src/extras/install/Makefile.debian-squeeze
@@ -4,6 +4,9 @@ DIR = $(dir $(lastword $(MAKEFILE_LIST)))
 APT_BACKPORT_TOOL = aptitude -t squeeze-backports -yq
 APT_SAFE_TOOL = aptitude -P
 APT_TOOL=aptitude -yq
+YAZ=yaz-4.2.32
+YAZ_HOST=http://ftp.indexdata.dk/pub/yaz
+
 
 export DEBS = \
 	apache2-prefork-dev\
@@ -40,12 +43,15 @@ export DEBS = \
 	libparent-perl\
 	libspreadsheet-writeexcel-perl\
 	libssh2-1-dev\
+	libtest-warn-perl\
 	libtext-aspell-perl\
 	libtext-csv-perl\
 	libuniversal-require-perl\
 	libunix-syslog-perl\
     libuuid-tiny-perl\
 	libyaz-dev\
+	libsoap-lite-perl\
+	libbz2-dev\
 	yaz
 
 export DEB_APACHE_MODS = \
@@ -82,15 +88,22 @@ PGSQL_CLIENT_DEBS_91 = \
 	libpq-dev \
 	postgresql-client-9.1
 
-all: install_pgsql_client_backport_debs_91
+
+all: install_pgsql_client_backport_debs_91 install_yaz
 	make -f $(DIR)/Makefile.debian install_debs
 	make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
 	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
 	make -f $(DIR)/Makefile.common install_cpan
 	make -f $(DIR)/Makefile.common install_cpan_force
+	make -f $(DIR)/Makefile.common install_libdbi
 	make -f $(DIR)/Makefile.debian install_js_sm
 	make -f $(DIR)/Makefile.debian debian_sys_config
 
+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
+
 install_postgres_server:
 	$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_91)
 
diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy
index 6169609..fb18745 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-wheezy
+++ b/Open-ILS/src/extras/install/Makefile.debian-wheezy
@@ -44,6 +44,7 @@ export DEBS = \
 	libspreadsheet-writeexcel-perl\
 	libsru-perl\
 	libssh2-1-dev\
+	libtest-warn-perl\
 	libtext-aspell-perl\
 	libtext-csv-perl\
 	libuniversal-require-perl\
@@ -51,6 +52,8 @@ export DEBS = \
     libuuid-tiny-perl\
 	libyaz-dev\
 	postgresql-client-9.1\
+	libsoap-lite-perl\
+	libbz2-dev\
 	yaz
 
 export DEB_APACHE_MODS = \
@@ -83,6 +86,7 @@ all:
 	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
 	make -f $(DIR)/Makefile.common install_cpan
 	make -f $(DIR)/Makefile.common install_cpan_force
+	make -f $(DIR)/Makefile.common install_libdbi
 	make -f $(DIR)/Makefile.debian install_js_sm
 	make -f $(DIR)/Makefile.debian debian_sys_config
 
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
index 80d2b3c..97783a4 100644
--- 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,7 +47,8 @@ export DEBS = \
 	libuniversal-require-perl\
 	libunix-syslog-perl\
     libuuid-tiny-perl\
-	libyaz-dev\
+	libbz2-dev\
+	libsoap-lite-perl
 
 export DEB_APACHE_MODS = \
     expires\
@@ -79,16 +85,20 @@ PGSQL_CLIENT_DEBS_91 = \
 	libpq-dev \
 	postgresql-client-9.1
 
-all:
+all: install_yaz
 	make -f $(DIR)/Makefile.debian install_debs
 	make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
-	make -f $(DIR)/Makefile.common install_yaz
 	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
 	make -f $(DIR)/Makefile.common install_cpan
 	make -f $(DIR)/Makefile.common install_cpan_force
 	make -f $(DIR)/Makefile.debian install_js_sm
 	make -f $(DIR)/Makefile.debian debian_sys_config
 
+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
+
 install_pgsql_server_debs_91:
 	$(APT_TOOL) install $(PGSQL_SERVER_DEBS_91)
 
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-precise b/Open-ILS/src/extras/install/Makefile.ubuntu-precise
index 96881a3..1b0d391 100644
--- 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 = \

commit a3c338f9417611e9116616472ca7ce3bec0ca75b
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Jul 8 15:43:57 2013 -0400

    LP 1190279 Installer makefiles OS targets for PG server
    
    Instead of requesting install_pgsql_server_debs_91,
    install_pgsql_server_backport_debs_91, etc. when installing the
    postgres server, simply give each OS type its own postgres install
    target.
    
    make -f Makefile.install postgres-server-debian-wheezy
    make -f Makefile.install postgres-server-debian-squeeze
    make -f Makefile.install postgres-server-ubuntu-lucid
    make -f Makefile.install postgres-server-ubuntu-precise
    make -f Makefile.install postgres-server-fedora
    
    Let the OS module decide what and how to install the postgres server.
    
    Changes are reflected in docs/installation/server_installation.txt
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index f6a31eb..4ddd7cb 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -62,4 +62,15 @@ ubuntu-precise:
 fedora:
 	@make -f $(DIR)/Makefile.fedora
 
+postgres-server-debian-wheezy:
+	@make -f $(DIR)/Makefile.debian-wheezy install_postgres_server
+postgres-server-debian-squeeze: 
+	@make -f $(DIR)/Makefile.debian-squeeze install_postgres_server
+postgres-server-ubuntu-lucid:
+	@make -f $(DIR)/Makefile.ubuntu-lucid install_postgres_server
+postgres-server-ubuntu-precise:
+	@make -f $(DIR)/Makefile.ubuntu-precise install_postgres_server
+postgres-server-fedora:
+	@make -f $(DIR)/Makefile.fedora install_postgres_server
+
 # vim:noet:sw=4:ts=4:
diff --git a/Open-ILS/src/extras/install/Makefile.debian-squeeze b/Open-ILS/src/extras/install/Makefile.debian-squeeze
index a8a114f..f87712b 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-squeeze
+++ b/Open-ILS/src/extras/install/Makefile.debian-squeeze
@@ -3,6 +3,7 @@
 DIR = $(dir $(lastword $(MAKEFILE_LIST)))
 APT_BACKPORT_TOOL = aptitude -t squeeze-backports -yq
 APT_SAFE_TOOL = aptitude -P
+APT_TOOL=aptitude -yq
 
 export DEBS = \
 	apache2-prefork-dev\
@@ -81,7 +82,7 @@ PGSQL_CLIENT_DEBS_91 = \
 	libpq-dev \
 	postgresql-client-9.1
 
-all:
+all: install_pgsql_client_backport_debs_91
 	make -f $(DIR)/Makefile.debian install_debs
 	make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
 	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
@@ -90,7 +91,7 @@ all:
 	make -f $(DIR)/Makefile.debian install_js_sm
 	make -f $(DIR)/Makefile.debian debian_sys_config
 
-install_pgsql_server_backport_debs_91:
+install_postgres_server:
 	$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_91)
 
 install_pgsql_client_backport_debs_91:
diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy
index 001ac1c..6169609 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-wheezy
+++ b/Open-ILS/src/extras/install/Makefile.debian-wheezy
@@ -86,7 +86,7 @@ all:
 	make -f $(DIR)/Makefile.debian install_js_sm
 	make -f $(DIR)/Makefile.debian debian_sys_config
 
-install_pgsql_server_debs_91:
+install_postgres_server:
 	make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)"
 
 clean:
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index 664a8cb..9834628 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -321,25 +321,28 @@ dedicated machine. You can install the packages required by Debian or Ubuntu Luc
 on the machine of your choice using the following commands as the *root*
 Linux account:
 
-.(Debian and Ubuntu Lucid) Installing PostgreSQL 9.1 server packages
-[source, bash]
-------------------------------------------------------------------------------
-make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91
-------------------------------------------------------------------------------
+.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages
+
+Each OS build target provides the postgres server installation packages
+required for each operating system.  To install Postgres server packages, 
+use the make target 'postgres-server-<OSTYPE>'.  Choose the most appropriate 
+command below based on your operating system.
 
-.(Ubuntu Precise) Installing PostgreSQL 9.1 server packages
 [source, bash]
 ------------------------------------------------------------------------------
-make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-squeeze
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-lucid
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
+make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
 ------------------------------------------------------------------------------
 
-You can install the packages required by Fedora on the machine of your choice
-using the following commands as the *root* Linux account:
+.(Fedora) Postgres initialization
+
+Installing Postgres on Fedora requires one additional step.
 
-.(Fedora) Installing PostgreSQL server packages
 [source, bash]
 ------------------------------------------------------------------------------
-make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server
 postgresql-setup initdb
 ------------------------------------------------------------------------------
 

commit c4f884b453f72b336ee9652f475e940b2d265ebd
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Thu Jun 13 07:56:45 2013 -0400

    LP 1190279 Ubuntu install targets
    
    Ubuntu 10.04 comes with Yaz 3.0.52.
    
    This installs version 4.2.32 from source.
    
    Adding per-distro makefiles for Ubuntu 10.04 and 12.04.
    
    Correcting minor typo
    
    SimpleServer installation expects yaz to already be installed
    
    Ubuntu 12.04 does not like libparent-perl
    
    Removing librose-uri-perl from the debs list since it is not in the 12.04 repo
    
    Adding libbz2-dev to the deb list
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common
index efd52d3..5db0e63 100644
--- a/Open-ILS/src/extras/install/Makefile.common
+++ b/Open-ILS/src/extras/install/Makefile.common
@@ -1,5 +1,10 @@
 # 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
@@ -32,4 +37,10 @@ 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.ubuntu-lucid b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
new file mode 100644
index 0000000..80d2b3c
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
@@ -0,0 +1,113 @@
+# install files for Ubuntu 10.04 LTS Lucid Lynx
+
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+APT_SAFE_TOOL = aptitude -P
+
+export DEBS = \
+	apache2-prefork-dev\
+	aspell\
+	aspell-en\
+	libbusiness-creditcard-perl\
+	libbusiness-isbn-data-perl\
+	libbusiness-isbn-perl\
+	libbusiness-onlinepayment-authorizenet-perl\
+	libbusiness-onlinepayment-perl\
+	libdatetime-format-builder-perl\
+	libdatetime-format-iso8601-perl\
+	libdatetime-format-mail-perl\
+	libdatetime-perl\
+	libdatetime-set-perl\
+	libdatetime-timezone-perl\
+	libdbd-pg-perl\
+	libemail-send-perl\
+	libemail-simple-perl\
+	libgd-graph3d-perl\
+	liblocale-maketext-lexicon-perl\
+	liblog-log4perl-perl\
+	libmarc-charset-perl \
+	libmarc-xml-perl \
+	libncurses5-dev\
+	libnet-ip-perl\
+	libnet-ldap-perl \
+	libnet-server-perl\
+	libnet-ssh2-perl\
+	libnet-z3950-zoom-perl \
+	libnspr4-dev\
+	libole-storage-lite-perl\
+	libparent-perl\
+	libspreadsheet-writeexcel-perl\
+	libssh2-1-dev\
+	libtext-aspell-perl\
+	libtext-csv-perl\
+	libuniversal-require-perl\
+	libunix-syslog-perl\
+    libuuid-tiny-perl\
+	libyaz-dev\
+
+export DEB_APACHE_MODS = \
+    expires\
+    include\
+    proxy\
+    proxy_http\
+    rewrite
+
+export DEB_APACHE_DISMODS = \
+    deflate
+
+export CPAN_MODULES = \
+	Business::OnlinePayment::PayPal \
+	Library::CallNumber::LC \
+	MARC::Record \
+	Net::Z3950::Simple2ZOOM \
+	RPC::XML \
+	Template::Plugin::POSIX \
+	SRU \
+	Rose::URI \
+	Safe
+
+export CPAN_MODULES_FORCE = \
+	Class::DBI::Frozen::301
+
+PGSQL_SERVER_DEBS_91 = \
+	postgresql-9.1 \
+	postgresql-contrib-9.1 \
+	postgresql-plperl-9.1 \
+	postgresql-server-dev-9.1
+
+PGSQL_CLIENT_DEBS_91 = \
+	libpq5 \
+	libpq-dev \
+	postgresql-client-9.1
+
+all:
+	make -f $(DIR)/Makefile.debian install_debs
+	make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
+	make -f $(DIR)/Makefile.common install_yaz
+	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
+	make -f $(DIR)/Makefile.common install_cpan
+	make -f $(DIR)/Makefile.common install_cpan_force
+	make -f $(DIR)/Makefile.debian install_js_sm
+	make -f $(DIR)/Makefile.debian debian_sys_config
+
+install_pgsql_server_debs_91:
+	$(APT_TOOL) install $(PGSQL_SERVER_DEBS_91)
+
+install_pgsql_client_backport_debs_91:
+	@if [ `$(APT_TOOL) versions libpq5 | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
+		then \
+		echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \
+		"of apache2-prefork-dev), but these are the 8.4 versions and they" \
+		"conflict with the 9.1 versions - so remove them, install the pinned" \
+		"backports of 9.1, then reinstall the apache2-prefork-dev package.\n\n" \
+		"**WARNING**: Saying 'Yes' to this step will _remove_ any PostgreSQL" \
+		"databases that might currently exist on this machine." && \
+		$(APT_SAFE_TOOL) remove libpq5 libpq-dev ; \
+	fi
+	$(APT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
+	$(APT_TOOL) install apache2-prefork-dev
+
+clean:
+	make -f $(DIR)/Makefile.common clean
+	make -f $(DIR)/Makefile.debian clean
+
+# vim:noet:sw=4:ts=4:
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-precise b/Open-ILS/src/extras/install/Makefile.ubuntu-precise
new file mode 100644
index 0000000..96881a3
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-precise
@@ -0,0 +1,101 @@
+# install files for Ubuntu 12.04 LTS Precise Pangolin
+
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+
+export DEBS = \
+	apache2-prefork-dev\
+	aspell\
+	aspell-en\
+	libbusiness-creditcard-perl\
+	libbusiness-edi-perl \
+	libbusiness-isbn-data-perl\
+	libbusiness-isbn-perl\
+	libbusiness-onlinepayment-authorizenet-perl\
+	libbusiness-onlinepayment-perl\
+	libdatetime-format-builder-perl\
+	libdatetime-format-iso8601-perl\
+	libdatetime-format-mail-perl\
+	libdatetime-perl\
+	libdatetime-set-perl\
+	libdatetime-timezone-perl\
+	libdbd-pg-perl\
+	libdbd-pgsql \
+	libdbi-dev \
+	libemail-send-perl\
+	libemail-simple-perl\
+	libgd-graph3d-perl\
+	liblibrary-callnumber-lc-perl \
+	liblocale-maketext-lexicon-perl\
+	liblog-log4perl-perl\
+	libmarc-charset-perl \
+	libmarc-record-perl\
+	libmarc-xml-perl \
+	libncurses5-dev\
+	libnet-https-any-perl \
+	libnet-ip-perl\
+	libnet-ldap-perl \
+	libnet-server-perl\
+	libnet-ssh2-perl\
+	libnet-z3950-simple2zoom-perl\
+	libnet-z3950-zoom-perl \
+	libnspr4-dev\
+	libole-storage-lite-perl\
+	libbz2-dev \
+	libpq5\
+	libpq-dev\
+	librpc-xml-perl\
+	libspreadsheet-writeexcel-perl\
+	libsru-perl\
+	libssh2-1-dev\
+	libtext-aspell-perl\
+	libtext-csv-perl\
+	libuniversal-require-perl\
+	libunix-syslog-perl\
+	libuuid-tiny-perl\
+	libyaz-dev\
+	postgresql-client-9.1\
+	yaz
+
+export DEB_APACHE_MODS = \
+    expires\
+    include\
+    proxy\
+    proxy_http\
+    rewrite
+
+export DEB_APACHE_DISMODS = \
+    deflate
+
+export CPAN_MODULES = \
+	Business::CreditCard::Object \
+	Business::OnlinePayment::PayPal \
+	Template::Plugin::POSIX \
+	Rose::URI \
+	Safe
+
+export CPAN_MODULES_FORCE = \
+	Class::DBI::Frozen::301
+
+PGSQL_SERVER_DEBS_91 = \
+	postgresql-9.1 \
+	postgresql-contrib-9.1 \
+	postgresql-plperl-9.1 \
+	postgresql-server-dev-9.1
+
+all:
+	make -f $(DIR)/Makefile.debian install_debs
+	make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
+	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
+	make -f $(DIR)/Makefile.common install_cpan
+	make -f $(DIR)/Makefile.common install_cpan_force
+	make -f $(DIR)/Makefile.debian install_js_sm
+	make -f $(DIR)/Makefile.debian debian_sys_config
+
+install_pgsql_server_debs_91:
+	make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)"
+
+clean:
+	make -f $(DIR)/Makefile.common clean
+	make -f $(DIR)/Makefile.debian clean
+
+# vim:noet:sw=4:ts=4:

commit a9558065ad54fd17891dbc444d7ade8059cd9a85
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Jun 12 11:18:46 2013 -0400

    LP 1190279 Modularize Makefile.install
    
    Create per-distro installer Makefiles for easier maintenance and
    per-distro tweaks.
    
    Included in this commit are installer Makefiles for debian wheezy and
    squeeze.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index ba27736..f6a31eb 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -4,12 +4,14 @@
 #
 # Makefile to install prerequisites for OpenSRF and Evergreen
 #
-# Currently supports Debian (squeeze), Ubuntu (10.04), Ubuntu (12.04) and
+# Currently supports Debian (wheezy, squeeze), Ubuntu (10.04), Ubuntu (12.04) and
 # Fedora (16 and 17).
 #
 # Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz
 #
 # usage:
+# 	make -f Makefile.install debian-wheezy
+# 	- or -
 # 	make -f Makefile.install debian-squeeze
 # 	- or -
 # 	make -f Makefile.install ubuntu-lucid
@@ -19,497 +21,45 @@
 # 	make -f Makefile.install fedora
 #
 # ---------------------------------------------------------------------
- 
+
+# variables shared by all installers
+
 # Make any assumptions about the shell being used explicit
-SHELL=/bin/bash 
+export SHELL=/bin/bash 
+
+export LIBJS=js-1.7.0
+export LIBJS_PERL=JavaScript-SpiderMonkey-0.21
+export LIBJS_URL=http://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz
+export LIBJS_PERL_URL=http://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJS_PERL).tar.gz
 
-LIBJS=js-1.7.0
-LIBJS_PERL=JavaScript-SpiderMonkey-0.21
-LIBJS_URL=http://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz
-LIBJS_PERL_URL=http://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJS_PERL).tar.gz
 # used for installing libjs lib and header files
-JS_INSTALL_PREFIX=/usr/
+export JS_INSTALL_PREFIX=/usr/
 
-LIBNET_Z3950_SIMPLESERVER=Net-Z3950-SimpleServer-1.15
-LIBNET_Z3950_SIMPLESERVER_URL=http://ftp.indexdata.dk/pub/simpleserver/$(LIBNET_Z3950_SIMPLESERVER)
+export LIBNET_Z3950_SIMPLESERVER=Net-Z3950-SimpleServer-1.15
+export LIBNET_Z3950_SIMPLESERVER_URL=http://ftp.indexdata.dk/pub/simpleserver/$(LIBNET_Z3950_SIMPLESERVER)
 
 # The libdbi sources can be fetched from sourceforge.net.  They are stored on
 # the open-ils.org site now for ease of direct linking
-LIBDBI=libdbi-0.8.3
-LIBDBI_DRIVERS=libdbi-drivers-0.8.3
-LIBDBI_HOST=http://open-ils.org/~denials/evergreen
-
-# We need a recent version of Yaz
-# Debian Lenny and Ubuntu 8.10 come with 3.0.34
-YAZ=yaz-4.2.32
-YAZ_HOST=http://ftp.indexdata.dk/pub/yaz
-
-APT_TOOL=aptitude -yq
-APT_SAFE_TOOL=aptitude -P
-APT_BACKPORT_TOOL=aptitude -t squeeze-backports -yq
-
-# Fedora?
-FEDORA=$(shell uname -r | grep "\.fc[0-9][0-9]\.")
-
-# Fedora 64-bit?
-FEDORA_64=$(shell uname -r | grep "\.fc[0-9][0-9]\.x86_64")
-
-# Debian dependencies
-DEBS =  \
-	apache2-prefork-dev\
-	aspell\
-	aspell-en\
-	check\
-	libbusiness-creditcard-perl\
-	libbusiness-onlinepayment-authorizenet-perl\
-	libbusiness-onlinepayment-perl\
-	libdatetime-format-builder-perl\
-	libdatetime-format-iso8601-perl\
-	libdatetime-format-mail-perl\
-	libdatetime-perl\
-	libdatetime-timezone-perl\
-	libdatetime-set-perl\
-	libdbd-pg-perl\
-	libemail-send-perl\
-	libemail-simple-perl\
-	libgd-graph3d-perl\
-	liblog-log4perl-perl\
-	libmarc-record-perl\
-	libncurses5-dev\
-	libnet-ldap-perl \
-	libnet-server-perl\
-	libnet-ssh2-perl\
-	libnspr4-dev\
-	libole-storage-lite-perl\
-	libspreadsheet-writeexcel-perl\
-	libssh2-1-dev\
-	libtest-warn-perl\
-	libtext-aspell-perl\
-	libtext-csv-perl\
-	libuniversal-require-perl\
-	libnet-ip-perl\
-	liblocale-maketext-lexicon-perl\
-	libunix-syslog-perl\
-	libbz2-dev
-
-# Debian Lenny and Ubuntu Intrepid bundle recent versions of yaz
-EXTRA_DEBS = \
-	libbusiness-isbn-perl\
-	libbusiness-isbn-data-perl\
-	libmarc-charset-perl \
-	libmarc-xml-perl \
-	libnet-z3950-zoom-perl \
-	libyaz-dev \
-	yaz
-
-EXTRA_DEBS_SQUEEZE = \
-    libparent-perl \
-    libuuid-tiny-perl
-
-EXTRA_DEBS_LUCID = \
-    libparent-perl
-
-EXTRA_DEBS_PRECISE = \
-    libdbi-dev \
-    libdbd-pgsql \
-    libmarc-record-perl \
-    libbusiness-edi-perl \
-    liblibrary-callnumber-lc-perl \
-    libsru-perl \
-    libnet-z3950-simple2zoom-perl \
-    libuuid-tiny-perl \
-    libnet-https-any-perl \
-    librpc-xml-perl
-
-FEDORA_RPMS = \
-	aspell \
-	aspell-en \
-	bzip2-devel \
-	check \
-	check-devel \
-	libdbi \
-	libdbi-dbd-pgsql \
-	libdbi-devel \
-	libssh2-devel \
-	libyaz \
-	libyaz-devel \
-	mingw32-nsiswrapper \
-	mod_ssl \
-	ncurses-devel \
-	ncurses-libs \
-	perl-parent \
-	perl-Business-CreditCard \
-	perl-Business-ISBN \
-	perl-Business-ISBN-Data \
-	perl-CPAN \
-	perl-DBD-Pg \
-	perl-Email-Send \
-	perl-Email-Simple \
-	perl-GDGraph3d \
-	perl-JSON-XS \
-	perl-LDAP \
-	perl-Library-CallNumber-LC \
-	perl-Locale-Codes \
-	perl-MARC-Charset \
-	perl-MARC-Record \
-	perl-Net-IP \
-	perl-Net-SSH2 \
-	perl-OLE-Storage_Lite \
-	perl-RPC-XML \
-	perl-Spreadsheet-WriteExcel \
-	perl-Test-Warn \
-	perl-Text-Aspell \
-	perl-Text-CSV \
-	perl-Text-CSV_XS \
-	perl-XML-Writer \
-	postgresql-devel \
-	readline-devel \
-	tcp_wrappers-devel \
-	wget \
-	yaz
-
-# Note: B:O:AuthorizeNet 3.21 fails with https://rt.cpan.org/Public/Bug/Display.html?id=55172
-# Should be fixed in 3.22
-# MARC::Record 2.0.1+ is required but only 2.0.0 is packaged
-FEDORA_CPAN = \
-	Business::OnlinePayment \
-	Business::OnlinePayment::AuthorizeNet \
-	Business::OnlinePayment::PayPal \
-	MARC::File::XML \
-	UUID::Tiny
-
-PGSQL_90_RPMS = \
-	postgresql90 \
-	postgresql90-contrib \
-	postgresql90-devel \
-	postgresql90-libs \
-	postgresql90-plperl \
-	postgresql90-server
-
-PGSQL_FEDORA_RPMS = \
-	postgresql \
-	postgresql-contrib \
-	postgresql-libs \
-	postgresql-plperl \
-	postgresql-server
-
-PGSQL_CLIENT_DEBS_90 = \
-	libpq5 \
-	libpq-dev \
-	postgresql-client-9.0
-
-PGSQL_CLIENT_DEBS_91 = \
-	libpq5 \
-	libpq-dev \
-	postgresql-client-9.1
-
-PGSQL_SERVER_DEBS_90 = \
-	postgresql-9.0 \
-	postgresql-contrib-9.0 \
-	postgresql-plperl-9.0 \
-	postgresql-server-dev-9.0
-
-PGSQL_SERVER_DEBS_91 = \
-	postgresql-9.1 \
-	postgresql-contrib-9.1 \
-	postgresql-plperl-9.1 \
-	postgresql-server-dev-9.1
-
-DEB_APACHE_MODS = \
-    expires\
-    include\
-    proxy\
-    proxy_http\
-    rewrite
-
-DEB_APACHE_DISMODS = \
-    deflate
-
-# Chronically unpackaged CPAN modules
-CPAN_MODULES = \
-	Business::OnlinePayment::PayPal \
-	Library::CallNumber::LC \
-	Net::Z3950::Simple2ZOOM \
-	Template::Plugin::POSIX \
-	SRU \
-	Rose::URI
-
-# More chronically unpackaged CPAN modules (available in Squeeze though)
-CPAN_MODULES_MORE = \
-    Business::CreditCard::Object \
-    MARC::Record \
-    Net::SSH2 \
-    UUID::Tiny
-
-# Are we sure most distros don't come with an acceptable version of Safe.pm?
-CPAN_MODULES_SAFE = \
-	Safe
-
-# Recent Debian/Ubuntus have libmarc-charset-perl, libmarc-xml-perl, libnet-z3950-zoom-perl
-CPAN_MODULES_MARC = \
-	Business::ISBN \
-	Business::ISBN::Data \
-	MARC::Charset \
-	MARC::File::XML \
-	Net::Z3950::ZOOM
-
-CPAN_MODULES_MARC_RECORD = \
-	MARC::Record
-
-CPAN_MODULES_FORCE = \
-	Class::DBI::Frozen::301
-
-# Debian Squeeze needs the following additional CPAN modules.
-CPAN_MODULES_SQUEEZE = \
-	RPC::XML
-
-# Lucid Lynx needs the following additional CPAN modules.
-CPAN_MODULES_LUCID = \
-    Rose::URI \
-    RPC::XML
-
-# Precise Pangolin needs the following CPAN modules. All others are
-# available as debs.
-CPAN_MODULES_PRECISE = \
-    Business::CreditCard::Object \
-    Business::OnlinePayment::PayPal \
-    Template::Plugin::POSIX \
-    Rose::URI
+export LIBDBI=libdbi-0.8.3
+export LIBDBI_DRIVERS=libdbi-drivers-0.8.3
+export LIBDBI_HOST=http://open-ils.org/~denials/evergreen
 
 # ----------------------------------------------------------------------------
 
-all: 
-	@echo "please specify an OS" && exit 0
-
-# these should be the same for any distro
-install: install_cpan install_js_sm install_cpan_force
-
-fedora: install_fedora_rpms install_cpan_fedora install_cpan_marc install
-
-debian-squeeze: squeeze generic_debian
-squeeze: install_pgsql_client_backport_debs_91  install_extra_debs_squeeze install_cpan_squeeze
-generic_debian: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_libdbi
-
-# Needs for Ubuntu Lucid Lynx (10.04 LTS):
-ubuntu-lucid: lucid generic_ubuntu
-lucid: install_pgsql_client_debs_90 install_extra_debs_lucid \
-       install_cpan_marc_record install_yaz install_cpan_more \
-       install_cpan_safe install_cpan_lucid install test_for_libdbi_pkg \
-       install_libdbi
-
-# Needs for Ubuntu Precise Pangolin (12.04 LTS):
-ubuntu-precise: precise generic_ubuntu
-precise: install_pgsql_client_debs_91 install_extra_debs_precise \
-	 install_cpan_precise install_js_sm install_cpan_force
+# avoid hard-coding the path to related makefiles
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))/install
 
-# We don't do the "install" target on generic_ubuntu because newer
-# Ubuntu releases, like newer Debian releases, include packages for
-# many of those prerequisites.
-generic_ubuntu: install_debs debian_sys_config
-
-# - COMMON TARGETS ---------------------------------------------------------
-
-# Install the CPAN modules
-install_cpan: install_net_z3950_simpleserver
-	for m in $(CPAN_MODULES); do perl -MCPAN -e "install \"$$m\";"; done
-
-install_cpan_more: 
-	for m in $(CPAN_MODULES_MORE); do perl -MCPAN -e "install \"$$m\";"; done
-
-# Install the CPAN modules for MARC functionality
-install_cpan_marc: install_cpan_marc_record
-	for m in $(CPAN_MODULES_MARC); do perl -MCPAN -e "install \"$$m\";"; done
-
-install_cpan_marc_record:
-	for m in $(CPAN_MODULES_MARC_RECORD); do perl -MCPAN -e "install \"$$m\";"; done
-
-install_cpan_force:
-	for m in $(CPAN_MODULES_FORCE); do \
-		echo "force install $$m" | perl -MCPAN -e shell ;\
-	done
-
-# Install the Safe Perl module
-# Is this really unpackaged everywhere except for Fedora?
-install_cpan_safe: 
-	for m in $(CPAN_MODULES_SAFE); do perl -MCPAN -e "install \"$$m\";"; done
-
-# Install the CPAN modules for Fedora
-install_cpan_fedora: 
-	for m in $(FEDORA_CPAN); do \
-		echo "force install $$m" | perl -MCPAN -e shell;\
-	done
-
-# Install the CPAN modules needed for Squeeze
-install_cpan_squeeze:
-	for m in $(CPAN_MODULES_SQUEEZE); do perl -MCPAN -e "install \"$$m\";"; done
-
-# Install the CPAN modules needed for Lucid
-install_cpan_lucid:
-	for m in $(CPAN_MODULES_LUCID); do perl -MCPAN -e "install \"$$m\";"; done
-
-# Install the CPAN modules needed for Precise
-install_cpan_precise:
-	for m in $(CPAN_MODULES_PRECISE); do perl -MCPAN -e "install \"$$m\";"; done
-
-# 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
-
-# Install the custom spidermonkey libs and JavaScript-SpiderMonkey Perl modules
-install_js_sm: install_libjs install_spidermonkey
-
-install_libjs: 
-	if [ ! -f $(LIBJS).tar.gz ]; then wget $(LIBJS_URL); fi;
-	tar -zxf $(LIBJS).tar.gz
-	cd js/src/ && JS_DIST=/usr make -f Makefile.ref
-	mkdir -p $(JS_INSTALL_PREFIX)/include/js/
-	cp js/src/*.h $(JS_INSTALL_PREFIX)/include/js/
-	cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/
-	if [ ! -z $(FEDORA_64) ]; then \
-		cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib64/ && \
-		cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib64/; \
-	else \
-		cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/ && \
-		cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/; \
-	fi;
-	ldconfig
-
-install_spidermonkey:
-	if [ ! -f $(LIBJS_PERL).tar.gz ]; then wget $(LIBJS_PERL_URL); fi;
-	tar -zxf $(LIBJS_PERL).tar.gz
-	if [ ! -z $(FEDORA_64) ]; then \
-		sed -i -e 's/"\/usr\/lib"/"\/usr\/lib64"/' $(LIBJS_PERL)/Makefile.PL ; \
-	fi;
-	if [ ! -z $(FEDORA) ]; then \
-		sed -i -e 's/js32.dll/libjs.so/' $(LIBJS_PERL)/Makefile.PL ; \
-	fi;
-	cd $(LIBJS_PERL) && perl Makefile.PL -E4X && make && make test && make install
-
-install_net_z3950_simpleserver:
-	if [ ! -f $(LIBNET_Z3950_SIMPLESERVER).tar.gz ]; then wget $(LIBNET_Z3950_SIMPLESERVER_URL).tar.gz; fi;
-	tar -zxf $(LIBNET_Z3950_SIMPLESERVER).tar.gz
-	cd $(LIBNET_Z3950_SIMPLESERVER) && perl Makefile.PL && make && make test && make install
-
-# On Ubuntu and possibly Debian, the libdbi0 package prevents the 
-# compiled-from-source version from being used and breaks the install.
-# This package might get installed depending on the install-time choices
-# for the distro. Test for its existence; if it's there, throw an error
-# message and exit.
-test_for_libdbi_pkg:
-		@if [ "$$(apt-cache policy libdbi0 | grep Installed | grep none | wc -l)" -eq 0 ]; then \
-				echo "*** Detected locally installed libdbi0 package; you must remove this"; \
-				echo "*** with a command like 'aptitude remove libdbi0' before proceeding"; \
-				echo "*** to successfully install Evergreen."; \
-				echo; \
-				echo "*** Note: this may break other applications on your system."; \
-				exit 0; \
-		fi;
-
-# Install libdbi and the postgres drivers
-install_libdbi:
-	if [ ! -d $(LIBDBI) ]; then wget $(LIBDBI_HOST)/$(LIBDBI).tar.gz; fi;
-	if [ ! -d $(LIBDBI_DRIVERS) ]; then wget $(LIBDBI_HOST)/$(LIBDBI_DRIVERS).tar.gz; fi;
-	tar -zxf $(LIBDBI).tar.gz
-	tar -zxf $(LIBDBI_DRIVERS).tar.gz
-	cd $(LIBDBI) && ./configure --disable-docs && make all install
-	cd $(LIBDBI_DRIVERS) && ./configure  \
-		--disable-docs --with-pgsql --enable-libdbi && make all install  
-
-clean:
-	make -C $(LIBDBI) clean
-	make -C $(LIBDBI_DRIVERS) clean
-	make -C $(LIBJS_PERL) clean
-	make -f Makefile.ref -C js/src/ clean
-
-
-# ------------------------------------------------------------------
-# - DEBIAN ---------------------------------------------------------
-
-debian_sys_config: 
-	# link the apache modules in
-	for m in $(DEB_APACHE_MODS); do a2enmod $$m; done;
-	# keep the bad apache modules away
-	for m in $(DEB_APACHE_DISMODS); do a2dismod $$m; done;
-	# refresh the dynamic library cache
-	ldconfig
-
-# Install the debian-specific dependencies
-install_debs:
-	$(APT_TOOL) install $(DEBS)
-
-install_pgsql_client_debs_90:
-	@if [ `$(APT_TOOL) versions libpq5 | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
-		then \
-		echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \
-		"of apache2-prefork-dev), but these are the 8.4 versions and they" \
-		"conflict with the 9.0 versions - so remove them, install the pinned" \
-		"backports of 9.0, then reinstall the apache2-prefork-dev package.\n\n" \
-		"**WARNING**: Saying 'Yes' to this step will _remove_ any PostgreSQL" \
-		"databases that might currently exist on this machine." && \
-		$(APT_SAFE_TOOL) remove libpq5 libpq-dev ; \
-	fi
-	$(APT_BACKPORT_TOOL) install $(PGSQL_CLIENT_DEBS_90)
-	$(APT_TOOL) install apache2-prefork-dev
-
-install_pgsql_server_debs_90:
-	$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_90)
-
-install_pgsql_client_backport_debs_91:
-	@if [ `$(APT_TOOL) versions libpq5 | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
-		then \
-		echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \
-		"of apache2-prefork-dev), but these are the 8.4 versions and they" \
-		"conflict with the 9.0 versions - so remove them, install the pinned" \
-		"backports of 9.0, then reinstall the apache2-prefork-dev package.\n\n" \
-		"**WARNING**: Saying 'Yes' to this step will _remove_ any PostgreSQL" \
-		"databases that might currently exist on this machine." && \
-		$(APT_SAFE_TOOL) remove libpq5 libpq-dev ; \
-	fi
-	$(APT_BACKPORT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
-	$(APT_TOOL) install apache2-prefork-dev
-
-install_pgsql_client_debs_91:
-	$(APT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
-
-install_pgsql_server_debs_91:
-	$(APT_TOOL) install $(PGSQL_SERVER_DEBS_91)
-
-install_pgsql_server_backport_debs_91:
-	$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_91)
-
-# Install the debian-specific dependencies for more modern distros
-install_extra_debs_squeeze: install_extra_debs
-	$(APT_TOOL) install $(EXTRA_DEBS_SQUEEZE)
-
-# Install dependencies for Ubuntu 10.04:
-install_extra_debs_lucid: install_extra_debs
-	$(APT_TOOL) install $(EXTRA_DEBS_LUCID)
-
-# Install dependencies for Ubuntu 12.04:
-install_extra_debs_precise: install_extra_debs
-	$(APT_TOOL) install $(EXTRA_DEBS_PRECISE)
-
-install_extra_debs:
-	$(APT_TOOL) install $(EXTRA_DEBS)
-
-# ------------------------------------------------------------------
-
-# FEDORA
-install_fedora_rpms:
-	yum -y update
-	yum -y install $(FEDORA_RPMS)
-
-install_fedora_pgsql_server:
-	yum -y install $(PGSQL_FEDORA_RPMS)
-
-# We need to add /usr/local/lib to the ldconfig list of directories on CentOS,
-# if it is not already there
-create_ld_local:
-	if [ "$$(ldconfig -v 2> /dev/null | grep '^/usr/local/lib' | wc -l)" -eq 0 ]; then \
-		echo '/usr/local/lib' >> /etc/ld.so.conf.d/local.conf; \
-		ldconfig; \
-	fi;
+all:
+	@echo "please specify an OS" && exit 0
+debian-wheezy:
+	@make -f $(DIR)/Makefile.debian-wheezy
+debian-squeeze: 
+	@make -f $(DIR)/Makefile.debian-squeeze
+ubuntu-lucid:
+	@make -f $(DIR)/Makefile.ubuntu-lucid
+ubuntu-precise:
+	@make -f $(DIR)/Makefile.ubuntu-precise
+fedora:
+	@make -f $(DIR)/Makefile.fedora
 
 # vim:noet:sw=4:ts=4:
diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common
new file mode 100644
index 0000000..efd52d3
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.common
@@ -0,0 +1,35 @@
+# Functions used by all installers
+
+# Install the CPAN modules
+install_cpan:
+	for m in $(CPAN_MODULES); do perl -MCPAN -e "install \"$$m\";"; done
+
+install_cpan_force:
+	for m in $(CPAN_MODULES_FORCE); do \
+		echo "force install $$m" | perl -MCPAN -e shell ;\
+	done
+
+install_net_z3950_simpleserver:
+	if [ ! -f $(LIBNET_Z3950_SIMPLESERVER).tar.gz ]; \
+		then wget $(LIBNET_Z3950_SIMPLESERVER_URL).tar.gz; \
+	fi;
+	tar -zxf $(LIBNET_Z3950_SIMPLESERVER).tar.gz
+	cd $(LIBNET_Z3950_SIMPLESERVER) && \
+		perl Makefile.PL && make && make test && make install
+
+# Install libdbi and the postgres drivers
+install_libdbi:
+	if [ ! -d $(LIBDBI) ]; then wget $(LIBDBI_HOST)/$(LIBDBI).tar.gz; fi;
+	if [ ! -d $(LIBDBI_DRIVERS) ]; then wget $(LIBDBI_HOST)/$(LIBDBI_DRIVERS).tar.gz; fi;
+	tar -zxf $(LIBDBI).tar.gz
+	tar -zxf $(LIBDBI_DRIVERS).tar.gz
+	cd $(LIBDBI) && ./configure --disable-docs && make all install
+	cd $(LIBDBI_DRIVERS) && ./configure  \
+		--disable-docs --with-pgsql --enable-libdbi && make all install  
+
+clean:
+	make -C $(LIBDBI) clean
+	make -C $(LIBDBI_DRIVERS) clean
+	make -C $(LIBJS_PERL) clean
+
+# vim:noet:sw=4:ts=4:
diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian
new file mode 100644
index 0000000..aa4d065
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.debian
@@ -0,0 +1,57 @@
+# actions required by all debian-based OSs
+
+# is this OS-specific?
+APT_TOOL=aptitude -yq
+
+install_debs:
+	$(APT_TOOL) install $(DEBS)
+
+# Install the custom spidermonkey libs and JavaScript-SpiderMonkey Perl modules
+install_js_sm: install_libjs install_spidermonkey
+
+install_libjs: 
+	if [ ! -f $(LIBJS).tar.gz ]; then wget $(LIBJS_URL); fi;
+	tar -zxf $(LIBJS).tar.gz
+	cd js/src/ && JS_DIST=/usr make -f Makefile.ref
+	mkdir -p $(JS_INSTALL_PREFIX)/include/js/
+	cp js/src/*.h $(JS_INSTALL_PREFIX)/include/js/
+	cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/
+	cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/
+	cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/
+	ldconfig
+
+
+install_spidermonkey:
+	if [ ! -f $(LIBJS_PERL).tar.gz ]; then wget $(LIBJS_PERL_URL); fi
+	tar -zxf $(LIBJS_PERL).tar.gz
+	cd $(LIBJS_PERL) && perl Makefile.PL -E4X \
+		&& make && make test && make install
+
+# On Ubuntu and possibly Debian, the libdbi0 package prevents the 
+# compiled-from-source version from being used and breaks the install.
+# This package might get installed depending on the install-time choices
+# for the distro. Test for its existence; if it's there, throw an error
+# message and exit.
+test_for_libdbi_pkg:
+		@if [ "$$(apt-cache policy libdbi0 | grep Installed | grep none | wc -l)" -eq 0 ]; then \
+				echo "*** Detected locally installed libdbi0 package; you must remove this"; \
+				echo "*** with a command like 'aptitude remove libdbi0' before proceeding"; \
+				echo "*** to successfully install Evergreen."; \
+				echo; \
+				echo "*** Note: this may break other applications on your system."; \
+				exit 0; \
+		fi;
+
+debian_sys_config: 
+	# link the apache modules in
+	for m in $(DEB_APACHE_MODS); do a2enmod $$m; done;
+	# keep the bad apache modules away
+	for m in $(DEB_APACHE_DISMODS); do a2dismod $$m; done;
+	# refresh the dynamic library cache
+	ldconfig
+
+clean:
+	make -f Makefile.ref -C js/src/ clean
+
+
+# vim:noet:sw=4:ts=4:
diff --git a/Open-ILS/src/extras/install/Makefile.debian-squeeze b/Open-ILS/src/extras/install/Makefile.debian-squeeze
new file mode 100644
index 0000000..a8a114f
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.debian-squeeze
@@ -0,0 +1,114 @@
+# install files for Debian Squeeze
+
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+APT_BACKPORT_TOOL = aptitude -t squeeze-backports -yq
+APT_SAFE_TOOL = aptitude -P
+
+export DEBS = \
+	apache2-prefork-dev\
+	aspell\
+	aspell-en\
+	libbusiness-creditcard-perl\
+	libbusiness-isbn-data-perl\
+	libbusiness-isbn-perl\
+	libbusiness-onlinepayment-authorizenet-perl\
+	libbusiness-onlinepayment-perl\
+	libdatetime-format-builder-perl\
+	libdatetime-format-iso8601-perl\
+	libdatetime-format-mail-perl\
+	libdatetime-perl\
+	libdatetime-set-perl\
+	libdatetime-timezone-perl\
+	libdbd-pg-perl\
+	libemail-send-perl\
+	libemail-simple-perl\
+	libgd-graph3d-perl\
+	liblocale-maketext-lexicon-perl\
+	liblog-log4perl-perl\
+	libmarc-charset-perl \
+	libmarc-record-perl\
+	libmarc-xml-perl \
+	libncurses5-dev\
+	libnet-ip-perl\
+	libnet-ldap-perl \
+	libnet-server-perl\
+	libnet-ssh2-perl\
+	libnet-z3950-zoom-perl \
+	libnspr4-dev\
+	libole-storage-lite-perl\
+	libparent-perl\
+	libspreadsheet-writeexcel-perl\
+	libssh2-1-dev\
+	libtext-aspell-perl\
+	libtext-csv-perl\
+	libuniversal-require-perl\
+	libunix-syslog-perl\
+    libuuid-tiny-perl\
+	libyaz-dev\
+	yaz
+
+export DEB_APACHE_MODS = \
+    expires\
+    include\
+    proxy\
+    proxy_http\
+    rewrite
+
+export DEB_APACHE_DISMODS = \
+    deflate
+
+export CPAN_MODULES = \
+	Business::OnlinePayment::PayPal \
+	Library::CallNumber::LC \
+	Net::Z3950::Simple2ZOOM \
+	RPC::XML \
+	Template::Plugin::POSIX \
+	SRU \
+	Rose::URI \
+	Safe
+
+export CPAN_MODULES_FORCE = \
+	Class::DBI::Frozen::301
+
+PGSQL_SERVER_DEBS_91 = \
+	postgresql-9.1 \
+	postgresql-contrib-9.1 \
+	postgresql-plperl-9.1 \
+	postgresql-server-dev-9.1
+
+PGSQL_CLIENT_DEBS_91 = \
+	libpq5 \
+	libpq-dev \
+	postgresql-client-9.1
+
+all:
+	make -f $(DIR)/Makefile.debian install_debs
+	make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
+	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
+	make -f $(DIR)/Makefile.common install_cpan
+	make -f $(DIR)/Makefile.common install_cpan_force
+	make -f $(DIR)/Makefile.debian install_js_sm
+	make -f $(DIR)/Makefile.debian debian_sys_config
+
+install_pgsql_server_backport_debs_91:
+	$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_91)
+
+install_pgsql_client_backport_debs_91:
+	@if [ `$(APT_TOOL) versions libpq5 | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
+		then \
+		echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \
+		"of apache2-prefork-dev), but these are the 8.4 versions and they" \
+		"conflict with the 9.1 versions - so remove them, install the pinned" \
+		"backports of 9.1, then reinstall the apache2-prefork-dev package.\n\n" \
+		"**WARNING**: Saying 'Yes' to this step will _remove_ any PostgreSQL" \
+		"databases that might currently exist on this machine." && \
+		$(APT_SAFE_TOOL) remove libpq5 libpq-dev ; \
+	fi
+	$(APT_BACKPORT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
+	$(APT_TOOL) install apache2-prefork-dev
+
+clean:
+	make -f $(DIR)/Makefile.common clean
+	make -f $(DIR)/Makefile.debian clean
+
+# vim:noet:sw=4:ts=4:
diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy
new file mode 100644
index 0000000..001ac1c
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.debian-wheezy
@@ -0,0 +1,96 @@
+# install files for Debian Wheezy
+
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+
+export DEBS = \
+	apache2-prefork-dev\
+	aspell\
+	aspell-en\
+	libbusiness-creditcard-perl\
+	libbusiness-isbn-data-perl\
+	libbusiness-isbn-perl\
+	libbusiness-onlinepayment-authorizenet-perl\
+	libbusiness-onlinepayment-perl\
+	libdatetime-format-builder-perl\
+	libdatetime-format-iso8601-perl\
+	libdatetime-format-mail-perl\
+	libdatetime-perl\
+	libdatetime-set-perl\
+	libdatetime-timezone-perl\
+	libdbd-pg-perl\
+	libemail-send-perl\
+	libemail-simple-perl\
+	libgd-graph3d-perl\
+	liblibrary-callnumber-lc-perl \
+	liblocale-maketext-lexicon-perl\
+	liblog-log4perl-perl\
+	libmarc-charset-perl \
+	libmarc-record-perl\
+	libmarc-xml-perl \
+	libncurses5-dev\
+	libnet-ip-perl\
+	libnet-ldap-perl \
+	libnet-server-perl\
+	libnet-ssh2-perl\
+	libnet-z3950-simple2zoom-perl\
+	libnet-z3950-zoom-perl \
+	libnspr4-dev\
+	libole-storage-lite-perl\
+	libparent-perl\
+	libpq5\
+	libpq-dev\
+	librose-uri-perl\
+	librpc-xml-perl\
+	libspreadsheet-writeexcel-perl\
+	libsru-perl\
+	libssh2-1-dev\
+	libtext-aspell-perl\
+	libtext-csv-perl\
+	libuniversal-require-perl\
+	libunix-syslog-perl\
+    libuuid-tiny-perl\
+	libyaz-dev\
+	postgresql-client-9.1\
+	yaz
+
+export DEB_APACHE_MODS = \
+    expires\
+    include\
+    proxy\
+    proxy_http\
+    rewrite
+
+export DEB_APACHE_DISMODS = \
+    deflate
+
+export CPAN_MODULES = \
+	Business::OnlinePayment::PayPal \
+	Template::Plugin::POSIX \
+	Safe
+
+export CPAN_MODULES_FORCE = \
+	Class::DBI::Frozen::301
+
+PGSQL_SERVER_DEBS_91 = \
+	postgresql-9.1 \
+	postgresql-contrib-9.1 \
+	postgresql-plperl-9.1 \
+	postgresql-server-dev-9.1
+
+all:
+	make -f $(DIR)/Makefile.debian install_debs
+	make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
+	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
+	make -f $(DIR)/Makefile.common install_cpan
+	make -f $(DIR)/Makefile.common install_cpan_force
+	make -f $(DIR)/Makefile.debian install_js_sm
+	make -f $(DIR)/Makefile.debian debian_sys_config
+
+install_pgsql_server_debs_91:
+	make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)"
+
+clean:
+	make -f $(DIR)/Makefile.common clean
+	make -f $(DIR)/Makefile.debian clean
+
+# vim:noet:sw=4:ts=4:

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/Makefile.install               |  525 ++------------------
 Open-ILS/src/extras/install/Makefile.common        |   35 ++
 Open-ILS/src/extras/install/Makefile.debian        |   56 ++
 .../src/extras/install/Makefile.debian-squeeze     |  128 +++++
 Open-ILS/src/extras/install/Makefile.debian-wheezy |  100 ++++
 Open-ILS/src/extras/install/Makefile.fedora        |  126 +++++
 Open-ILS/src/extras/install/Makefile.ubuntu-lucid  |  124 +++++
 .../src/extras/install/Makefile.ubuntu-precise     |  103 ++++
 docs/installation/server_installation.txt          |   25 +-
 9 files changed, 729 insertions(+), 493 deletions(-)
 create mode 100644 Open-ILS/src/extras/install/Makefile.common
 create mode 100644 Open-ILS/src/extras/install/Makefile.debian
 create mode 100644 Open-ILS/src/extras/install/Makefile.debian-squeeze
 create mode 100644 Open-ILS/src/extras/install/Makefile.debian-wheezy
 create mode 100644 Open-ILS/src/extras/install/Makefile.fedora
 create mode 100644 Open-ILS/src/extras/install/Makefile.ubuntu-lucid
 create mode 100644 Open-ILS/src/extras/install/Makefile.ubuntu-precise


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list