[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 02e621cf64093b5b2836f21f7c47a7cf7bbb34a7

[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, rel_2_1 has been updated
       via  02e621cf64093b5b2836f21f7c47a7cf7bbb34a7 (commit)
      from  4e79be2f645af602292e82db0e8d1dda8ad3f7e5 (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 02e621cf64093b5b2836f21f7c47a7cf7bbb34a7
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Aug 30 13:05:16 2011 -0400

    Fix for LP bug #702422.
    
    Add @libdir@/javascript/ path in legacy script section of
    oils_sip.xml.example so that legacy scripts work with SIP2.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/examples/oils_sip.xml.example b/Open-ILS/examples/oils_sip.xml.example
index 3111626..467cc99 100644
--- a/Open-ILS/examples/oils_sip.xml.example
+++ b/Open-ILS/examples/oils_sip.xml.example
@@ -127,6 +127,7 @@
                     -->
 					<path>LOCALSTATEDIR/</path>
                     <path>LOCALSTATEDIR/catalog/</path>
+		    <path>LIBDIR/javascript/</path>
 					<item_config>circ/circ_item_config.js</item_config>
 				</scripts>
 
diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index e14f4c2..13b3e63 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -176,6 +176,7 @@ ilscore-install:
 	cp -r @srcdir@/templates/strings $(DESTDIR)$(TEMPLATEDIR)
 	sed -i 's|LOCALSTATEDIR|@localstatedir@|g' '$(DESTDIR)@sysconfdir@/oils_sip.xml.example'
 	sed -i 's|SYSCONFDIR|@sysconfdir@|g' '$(DESTDIR)@sysconfdir@/oils_sip.xml.example'
+	sed -i 's|LIBDIR|@libdir@|g' '$(DESTDIR)@sysconfdir@/oils_sip.xml.example'
 	sed -i 's|LOCALSTATEDIR|@localstatedir@|g' '$(DESTDIR)@sysconfdir@/opensrf_core.xml.example'
 	sed -i 's|SYSCONFDIR|@sysconfdir@|g' '$(DESTDIR)@sysconfdir@/opensrf_core.xml.example'
 	sed -i 's|LOCALSTATEDIR|@localstatedir@|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example'

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

Summary of changes:
 Open-ILS/examples/oils_sip.xml.example |    1 +
 Open-ILS/src/Makefile.am               |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS