From e1756e47c0b6b98587d3589bc6daae329e1c254b Mon Sep 17 00:00:00 2001 From: berick Date: Sat, 30 Apr 2011 18:16:49 -0400 Subject: [PATCH] update makefile install for debian-based targets to install postgres 9 --- Open-ILS/src/extras/Makefile.install | 40 +++++++++++++----------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index 9a34072c6d..763a6b7948 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -205,20 +205,14 @@ PGSQL_84_RPMS = \ postgresql-plpe*-8.4* \ postgresql-server-8.4* -PGSQL_CLIENT_DEBS_82 = \ +PGSQL_CLIENT_DEBS_90 = \ postgresql-client -PGSQL_CLIENT_DEBS_83 = \ - postgresql-client - -PGSQL_CLIENT_DEBS_84 = \ - postgresql-client-8.4 - -PGSQL_SERVER_DEBS_84 = \ - postgresql-8.4 \ - postgresql-contrib-8.4 \ - postgresql-plperl-8.4 \ - postgresql-server-dev-8.4 +PGSQL_SERVER_DEBS_90 = \ + postgresql-9.0 \ + postgresql-contrib-9.0 \ + postgresql-plperl-9.0 \ + postgresql-server-dev-9.0 DEB_APACHE_MODS = \ expires\ @@ -276,14 +270,14 @@ fedora14: fedora13 debian-lenny: lenny generic_debian install_cpan_more install_cpan_safe debian-squeeze: squeeze generic_debian -lenny: install_pgsql_client_debs_83 install_extra_debs -squeeze: install_pgsql_client_debs_84 install_extra_debs_squeeze +lenny: install_pgsql_client_debs_90 install_extra_debs +squeeze: install_pgsql_client_debs_90 install_extra_debs_squeeze generic_debian: install_debs test_for_libdbi_pkg install debian_sys_config install_cpan_force ubuntu-hardy: hardy generic_ubuntu ubuntu-lucid: lucid generic_ubuntu -hardy: install_pgsql_client_debs_82 install_yaz install_cpan_marc install_extra_encode -lucid: install_pgsql_client_debs_84 install_extra_debs +hardy: install_pgsql_client_debs_90 install_yaz install_cpan_marc install_extra_encode +lucid: install_pgsql_client_debs_90 install_extra_debs generic_ubuntu: install_debs test_for_libdbi_pkg install debian_sys_config install_cpan_more install_cpan_safe install_cpan_force # - COMMON TARGETS --------------------------------------------------------- @@ -392,17 +386,11 @@ debian_sys_config: install_debs: $(APT_TOOL) install $(DEBS) -install_pgsql_client_debs_84: - $(APT_TOOL) install $(PGSQL_CLIENT_DEBS_84) - -install_pgsql_server_debs_84: - $(APT_TOOL) install $(PGSQL_SERVER_DEBS_84) - -install_pgsql_client_debs_83: - $(APT_TOOL) install $(PGSQL_CLIENT_DEBS_83) +install_pgsql_client_debs_90: + $(APT_TOOL) install $(PGSQL_CLIENT_DEBS_90) -install_pgsql_client_debs_82: - $(APT_TOOL) install $(PGSQL_CLIENT_DEBS_82) +install_pgsql_server_debs_90: + $(APT_TOOL) install $(PGSQL_SERVER_DEBS_90) # Install the debian-specific dependencies for more modern distros install_extra_debs_squeeze: install_extra_debs -- 2.11.0