From ebe5a4950ae04fb844e9fbc7ade9a1b3ac34a920 Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Fri, 19 Aug 2011 12:20:19 -0400 Subject: [PATCH] conditional remove of libpq5 libpq-dev in Makefile In Makefile.install for the install_pgsql_client_debs_90 target. Only do it if version 8 of libpq-dev is installed. Signed-off-by: Jason Etheridge Signed-off-by: Dan Scott --- Open-ILS/src/extras/Makefile.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index bb69740feb..666e55645d 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -401,7 +401,7 @@ install_debs: # 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 $(APT_TOOL) remove libpq5 libpq-dev ; fi $(APT_BACKPORT_TOOL) install $(PGSQL_CLIENT_DEBS_90) $(APT_TOOL) install apache2-prefork-dev -- 2.11.0