From a6511aa7bfedbeb778a9cf180cc201fca4887d55 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 9 Aug 2013 17:09:44 -0400 Subject: [PATCH] Squeeze also needs an updated yaz; Yaz-related repairs Signed-off-by: Bill Erickson --- Open-ILS/src/extras/install/Makefile.debian-squeeze | 11 ++++++++++- Open-ILS/src/extras/install/Makefile.ubuntu-lucid | 17 +++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Open-ILS/src/extras/install/Makefile.debian-squeeze b/Open-ILS/src/extras/install/Makefile.debian-squeeze index 567cfd5330..398058c7b6 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\ @@ -84,7 +87,8 @@ 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 @@ -94,6 +98,11 @@ all: install_pgsql_client_backport_debs_91 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.ubuntu-lucid b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid index 3ec6122e40..2a3101c5e0 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid @@ -47,8 +47,7 @@ export DEBS = \ libuniversal-require-perl\ libunix-syslog-perl\ libuuid-tiny-perl\ - libsoap-lite-perl\ - libyaz-dev\ + libsoap-lite-perl export DEB_APACHE_MODS = \ expires\ @@ -85,22 +84,20 @@ 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: +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) -- 2.11.0