[open-ils-commits] [GIT] Evergreen ILS branch master updated. 59d09ca287a7c4ec83657d26c902ac13d0b700aa

[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, master has been updated
       via  59d09ca287a7c4ec83657d26c902ac13d0b700aa (commit)
      from  8fa616a1ea7395e313168e7b2ca575a43a6483f9 (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 59d09ca287a7c4ec83657d26c902ac13d0b700aa
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Aug 30 12:50:34 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 14446aa..5d4ebd3 100644
--- a/Open-ILS/examples/oils_sip.xml.example
+++ b/Open-ILS/examples/oils_sip.xml.example
@@ -136,6 +136,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 796d39c..072814c 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -170,6 +170,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