From 69f2032cd44dc2daf8cc239e506ea0368ae878ca Mon Sep 17 00:00:00 2001 From: dbs Date: Thu, 6 Nov 2008 22:36:35 +0000 Subject: [PATCH] Backport r11077 from trunk: copy the non-entity version of fm_IDL.xml into place first; then overwrite if any i18n locale has been built/installed git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@11089 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am index 77dffbe1e7..658e931a19 100644 --- a/Open-ILS/src/Makefile.am +++ b/Open-ILS/src/Makefile.am @@ -231,8 +231,11 @@ webcore-install: mkdir -p $(WEBDIR)/opac/extras/slimpac/ mkdir -p $(WEBDIR)/standalone/ mkdir -p $(opacextrasdir) + mkdir -p $(DESTDIR)$(reportsdir) mkdir -p $(XSLDIR) - cp -r @top_srcdir@/Open-ILS/web/ @localstatedir@ + rm -f $(DESTDIR)$(reportsdir)/fm_IDL.xml + cp $(DESTDIR)@sysconfdir@/fm_IDL.xml $(DESTDIR)$(WEBDIR)/reports/ + cp -r @top_srcdir@/Open-ILS/web/. $(DESTDIR)$(WEBDIR) cp @top_srcdir@/Open-ILS/xsl/*.xsl $(opacextrasdir) cp @top_srcdir@/Open-ILS/xsl/*.xsl $(XSLDIR) ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/mresult.xml @@ -241,8 +244,6 @@ webcore-install: ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/advanced.xml ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/myopac.xml ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/cnbrowse.xml - rm -f $(DESTDIR)$(WEBDIR)/reports/fm_IDL.xml - cp $(DESTDIR)@sysconfdir@/fm_IDL.xml $(DESTDIR)$(WEBDIR)/reports/ offline-install: -- 2.11.0