[open-ils-commits] [GIT] Evergreen ILS branch master updated. 910e31cfa9e5cf79a5938c8d41316444af7098a0

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  910e31cfa9e5cf79a5938c8d41316444af7098a0 (commit)
       via  5536bd52ecea4d13c82c1bd5a4eb86a83c78f34d (commit)
      from  5ee9fd8bdd36c6c52896adfb8d18f9b843b4ad3d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 910e31cfa9e5cf79a5938c8d41316444af7098a0
Author: Dan Scott <dscott at laurentian.ca>
Date:   Mon Nov 21 12:41:03 2011 -0500

    Avoid redundant install_cpan_force dependencies
    
    The "install" target and each of the generic distro targets in
    Makefile.install included install_cpan_force; make the "install" target
    more useful by factoring out the install_libdbi dependency so that
    "install" is truly common again (and we only add the install_cpan_force
    dependency once).
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 3fd22f5..30a993a 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -287,21 +287,21 @@ all:
 	@echo "please specify an OS" && exit 0
 
 # these should be the same for any distro
-install: install_cpan install_js_sm install_libdbi install_cpan_force
+install: install_cpan install_js_sm install_cpan_force
 
 centos: install_centos_pgsql centos_like
 rhel: install_redhat_pgsql centos_like
-centos_like: install_centos_rpms install_yaz install_cpan_marc install install_centos_perl create_ld_local install_cpan_safe install_cpan_force
+centos_like: install_centos_rpms install_yaz install_cpan_marc install install_centos_perl create_ld_local install_cpan_safe install_libdbi
 
-fedora16: install_fedora_rpms install_cpan install_cpan_fedora install_cpan_marc install_js_sm install_cpan_force
+fedora16: install_fedora_rpms install_cpan_fedora install_cpan_marc install
 
 debian-squeeze: squeeze generic_debian
 squeeze: install_pgsql_client_debs_90  install_extra_debs_squeeze
-generic_debian: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_cpan_force
+generic_debian: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_libdbi
 
 ubuntu-lucid: lucid generic_ubuntu
 lucid: install_pgsql_client_debs_90 install_extra_debs install_cpan_marc_record install_yaz install_cpan_lucid
-generic_ubuntu: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_cpan_more install_cpan_safe install_cpan_force
+generic_ubuntu: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_cpan_more install_cpan_safe install_libdbi
 
 # - COMMON TARGETS ---------------------------------------------------------
 

commit 5536bd52ecea4d13c82c1bd5a4eb86a83c78f34d
Author: Dan Scott <dscott at laurentian.ca>
Date:   Mon Nov 21 12:38:56 2011 -0500

    Add install_yaz dependency to debian and ubuntu Makefile.install
    
    To build SimpleServer 1.15 we need a version of yaz 4.2+, so add
    install_yaz as a dependency for debian and ubuntu. This should have been
    added in LP 872284 but was overlooked due to local testing and didn't
    get any further testing before being committed.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 879cf00..3fd22f5 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -297,11 +297,11 @@ fedora16: install_fedora_rpms install_cpan install_cpan_fedora install_cpan_marc
 
 debian-squeeze: squeeze generic_debian
 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
+generic_debian: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_cpan_force
 
 ubuntu-lucid: lucid generic_ubuntu
 lucid: install_pgsql_client_debs_90 install_extra_debs install_cpan_marc_record install_yaz install_cpan_lucid
-generic_ubuntu: install_debs test_for_libdbi_pkg install debian_sys_config install_cpan_more install_cpan_safe install_cpan_force
+generic_ubuntu: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_cpan_more install_cpan_safe install_cpan_force
 
 # - COMMON TARGETS ---------------------------------------------------------
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/Makefile.install |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS