[open-ils-commits] [GIT] Evergreen ILS branch master updated. 4f022d3e784aaa23133f2a01f6411e4f8726c8ee

[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  4f022d3e784aaa23133f2a01f6411e4f8726c8ee (commit)
      from  b98fdee97fa6962e7bf2d901e1019b115ebbafea (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 4f022d3e784aaa23133f2a01f6411e4f8726c8ee
Author: Dan Scott <dscott at laurentian.ca>
Date:   Mon Apr 22 13:00:05 2013 -0400

    Unbreak make install for apache config files
    
    The new install process installs the Apache sample configs into the
    DOCDIR for Evergreen, with the expectation that packagers will pick up
    the examples from the doc directory and that users will eventually be
    expected to copy them from there, rather than from the source tree.
    
    However, currently the Apache 2.2 and 2.4 sample configs have the same
    names, and that causes a conflict at "make install" time. Kudos to Jason
    Stephenson for catching this. The temporary solution is to rename the
    Apache 2.4 files to avoid the conflict; longer term, we need to teach
    make install to only make & install the files that are pertinent to the
    environment on which it was built (either Apache 2.2, or Apache 2.4).
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index e9ccaed..0363c4b 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -147,8 +147,8 @@ gen_docs = \
 	$(examples)/apache/eg.conf \
 	$(examples)/apache/eg_vhost.conf \
 	$(examples)/apache/eg_startup \
-	$(examples)/apache_24/eg.conf \
-	$(examples)/apache_24/eg_vhost.conf
+	$(examples)/apache_24/eg_24.conf \
+	$(examples)/apache_24/eg_vhost_24.conf
 
 bin_SCRIPTS = $(core_scripts) $(gen_scripts) $(reporter_scripts) $(installautojs)
 
@@ -238,10 +238,10 @@ $(examples)/apache/eg_vhost.conf: Makefile $(examples)/apache/eg_vhost.conf.in
 $(examples)/apache/eg_startup: Makefile $(examples)/apache/eg_startup.in
 	$(do_subst) $(examples)/apache/eg_startup.in > "$@"
 
-$(examples)/apache_24/eg.conf: Makefile $(examples)/apache_24/eg.conf.in
+$(examples)/apache_24/eg_24.conf: Makefile $(examples)/apache_24/eg.conf.in
 	$(do_subst) $(examples)/apache_24/eg.conf.in > "$@"
 
-$(examples)/apache_24/eg_vhost.conf: Makefile $(examples)/apache_24/eg_vhost.conf.in
+$(examples)/apache_24/eg_vhost_24.conf: Makefile $(examples)/apache_24/eg_vhost.conf.in
 	$(do_subst) $(examples)/apache_24/eg_vhost.conf.in > "$@"
 
 #perl-install and string-templates-install	

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

Summary of changes:
 Open-ILS/src/Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS