[open-ils-commits] r11089 - branches/rel_1_4/Open-ILS/src

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-11-06 17:36:35 -0500 (Thu, 06 Nov 2008)
New Revision: 11089

Modified:
   branches/rel_1_4/Open-ILS/src/Makefile.am
Log:
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

Modified: branches/rel_1_4/Open-ILS/src/Makefile.am
===================================================================
--- branches/rel_1_4/Open-ILS/src/Makefile.am	2008-11-06 22:33:10 UTC (rev 11088)
+++ branches/rel_1_4/Open-ILS/src/Makefile.am	2008-11-06 22:36:35 UTC (rev 11089)
@@ -231,8 +231,11 @@
 	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 @@
 	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: