[open-ils-commits] r9400 - in branches/acq-experiment: . Open-ILS/src

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-04-21 13:31:21 -0400 (Mon, 21 Apr 2008)
New Revision: 9400

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/src/Makefile
Log:
Merged revisions 9398 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r9398 | erickson | 2008-04-21 13:25:40 -0400 (Mon, 21 Apr 2008) | 1 line
  
  copying required opensrf libs into the dojo/opensrf dir
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-9396
   + /trunk:1-9398

Modified: branches/acq-experiment/Open-ILS/src/Makefile
===================================================================
--- branches/acq-experiment/Open-ILS/src/Makefile	2008-04-21 17:31:06 UTC (rev 9399)
+++ branches/acq-experiment/Open-ILS/src/Makefile	2008-04-21 17:31:21 UTC (rev 9400)
@@ -74,7 +74,9 @@
 	cp -r ../web/* $(WEBDIR)
 	cp $(OPENSRF_LIBS)/javascript/* $(WEBDIR)/opac/common/js/
 	# dojo-ified opensrf libs
-	cp $(OPENSRF_LIBS)/javascript/opensrf*js $(WEBDIR)/js/opensrf/
+	cp $(OPENSRF_LIBS)/javascript/md5.js $(WEBDIR)/js/dojo/opensrf/
+	cp $(OPENSRF_LIBS)/javascript/JSON_v1.js $(WEBDIR)/js/dojo/opensrf/
+	cp $(OPENSRF_LIBS)/javascript/opensrf*js $(WEBDIR)/js/dojo/opensrf/
 	cp $(OPENSRF_LIBS)/javascript/DojoSRF.js $(WEBDIR)/js/dojo/
 	ln -sf $(WEBDIR)/opac/skin/default/xml/index.xml $(WEBDIR)/opac/skin/default/xml/mresult.xml
 	ln -sf $(WEBDIR)/opac/skin/default/xml/index.xml $(WEBDIR)/opac/skin/default/xml/rresult.xml