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

[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  bb8c14f0afdf8660d8f0fc701dadbe60f44f79a6 (commit)
      from  0469a1cb06a6adcaf80e04325618be9fca3895c7 (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 bb8c14f0afdf8660d8f0fc701dadbe60f44f79a6
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Thu Sep 6 18:57:05 2018 -0400

    LP#1791184: ensure that 'make clean' doesn't delete pingest.pl
    
    This patch corrects an issue where pingest.pl was treated as if
    it were generated from a pingest.pl.in source file during the configure
    step, meaning that it got deleted by 'make clean'.  This patch also
    adds a couple helpful comments.
    
    To test
    -------
    [1] Apply the patch.
    [2] From a git checkout, run the configure and make steps, followed
        by a 'make clean'. Verify that pingest.pl is not deleted from
        the source tree.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index 444846b..a9de4a9 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -75,7 +75,8 @@ core_scripts =   $(examples)/oils_ctl.sh \
 		 $(supportscr)/sitemap_generator \
 		 $(srcdir)/extras/eg_config \
 		 $(srcdir)/extras/openurl_map.pl \
-		 $(srcdir)/extras/import/marc_add_ids
+		 $(srcdir)/extras/import/marc_add_ids \
+		 $(supportscr)/pingest.pl
 
 installautojs = $(autojsbinscripts)
 
@@ -118,6 +119,8 @@ if BUILDEGJAVA
 OILSJAVA_DIR = java
 endif
 
+# scripts that are generated from *.in files and can
+# be deleted by a make clean
 gen_scripts = \
 	@srcdir@/extras/fast-extract \
 	@srcdir@/extras/import/marc2are.pl \
@@ -129,9 +132,10 @@ gen_scripts = \
 	$(supportscr)/authority_authority_linker.pl \
 	$(supportscr)/eg_db_config \
 	$(supportscr)/marc_export \
-	$(supportscr)/offline-blocked-list.pl \
-	$(supportscr)/pingest.pl
+	$(supportscr)/offline-blocked-list.pl
 
+# config files that are generated from *.in files and can
+# be deleted by a make clean
 gen_docs = \
 	$(examples)/apache/eg.conf \
 	$(examples)/apache/eg_vhost.conf \

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

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


hooks/post-receive
-- 
Evergreen ILS