Protect against installs with no locales
authorDan Scott <dscott@laurentian.ca>
Tue, 21 Aug 2012 21:23:26 +0000 (17:23 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 21 Aug 2012 21:38:45 +0000 (17:38 -0400)
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@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>

Open-ILS/src/Makefile.am

index 42497a1..9d1c534 100644 (file)
@@ -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/
+       -@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'