In dependency hell over Yaz/Net::Z3950::SimpleServer.

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index bff45da..54ae1fa 100644 (file)
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -37,9 +37,10 @@ export LIBJS_PERL_URL=http://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH
 # used for installing libjs lib and header files
 export JS_INSTALL_PREFIX=/usr/
 
-export LIBNET_Z3950_SIMPLESERVER=Net-Z3950-SimpleServer-1.16
+export LIBNET_Z3950_SIMPLESERVER=Net-Z3950-SimpleServer-1.12
 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
 export LIBDBI=libdbi-0.8.3

diff --git a/Open-ILS/src/extras/install/Makefile.centos b/Open-ILS/src/extras/install/Makefile.centos
index 1fcca7a..0d1958a 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.centos
+++ b/Open-ILS/src/extras/install/Makefile.centos
@@ -100,7 +100,7 @@ install_libjs:
        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 \
+       if [ ! -z $(CENTOS_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 \
@@ -120,7 +120,13 @@ install_spidermonkey:
        fi;
        cd $(LIBJS_PERL) && perl Makefile.PL -E4X && make && make test && make install
 
-
+install_yaz:
+       if [ ! -d $(YAZ) ]; then \
+               wget $(YAZ_HOST)/$(YAZ).tar.gz ; \
+               tar xzf $(YAZ).tar.gz ; \
+               cd $(YAZ) && ./configure && make && make install && ldconfig \
+       fi ; 
+               
 clean:
        make -f $(DIR)/Makefile.common clean