From: Dan Scott Date: Mon, 22 Apr 2013 17:00:05 +0000 (-0400) Subject: Unbreak make install for apache config files X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4f022d3e784aaa23133f2a01f6411e4f8726c8ee;p=evergreen%2Fequinox.git 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 Signed-off-by: Jason Stephenson --- diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am index e9ccaed23d..0363c4bea4 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