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

[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  6a20cbd112326f8681c80c6302cb7bd535d51adc (commit)
      from  4bbe2ae8bdeec90e000f35be8aad6b34518ad559 (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 6a20cbd112326f8681c80c6302cb7bd535d51adc
Author: Dan Scott <dscott at laurentian.ca>
Date:   Tue Aug 21 17:23:26 2012 -0400

    Protect against installs with no locales
    
    Installs from source outside of tarballs may not have a built locale,
    which would result in a make error and an aborted install. Protect
    against that by checking for the existence of the locale install
    directory before trying to copy the files into place.
    
    In the weird case that Open-ILS/src/data/locale has been generated but
    there are no files in it, protect against erroring out via the judicious
    application of the - flag.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index 42497a1..9d1c534 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -219,9 +219,11 @@ ilscore-install:
 	$(MKDIR_P) $(DESTDIR)$(TEMPLATEDIR)
 	@echo "Installing templates to $(DESTDIR)$(TEMPLATEDIR)"
 	cp -r @srcdir@/templates/* $(DESTDIR)$(TEMPLATEDIR)
-	$(MKDIR_P) $(DESTDIR)$(datadir)/locale/
-	@echo "Installing template data files to $(datadir)/locale/"
-	cp @srcdir@/data/locale/* $(datadir)/locale/
+	- at if test -d @srcdir@/data/locale; then \
+		$(MKDIR_P) $(DESTDIR)$(datadir)/locale/ && \
+		echo "Installing template data files to $(datadir)/locale/" && \
+		cp @srcdir@/data/locale/* $(datadir)/locale/ ;\
+	fi;
 	$(MKDIR_P) $(DESTDIR)$(datadir)/overdue/
 	sed -i 's|LOCALSTATEDIR|@localstatedir@|g' '$(DESTDIR)@sysconfdir@/oils_sip.xml.example'
 	sed -i 's|SYSCONFDIR|@sysconfdir@|g' '$(DESTDIR)@sysconfdir@/oils_sip.xml.example'

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

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


hooks/post-receive
-- 
Evergreen ILS