Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac...

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 0241bbf..7307e14 100644 (file)
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -52,6 +52,7 @@ PAY_ONLINE=Business-OnlinePayment-3.00_08.tar.gz
 PAY_ONLINE_HOST=http://ftp.perl.org/pub/CPAN/authors/id/I/IV/IVAN/
 
 APT_TOOL=aptitude -yq
+APT_SAFE_TOOL=aptitude -P
 APT_BACKPORT_TOOL=aptitude -t squeeze-backports -yq
 
 # 64 or 32 bit os?
@@ -403,12 +404,17 @@ debian_sys_config:
 install_debs:
        $(APT_TOOL) install $(DEBS)
 
-# libpq5 / libpq-dev get 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
 install_pgsql_client_debs_90:
-       $(APT_TOOL) remove libpq5 libpq-dev
+       @if [ `$(APT_TOOL) versions libpq-dev | 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