Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/ttopac-master-merge
authorDan Scott <dan@coffeecode.net>
Thu, 18 Aug 2011 13:22:17 +0000 (09:22 -0400)
committerDan Scott <dan@coffeecode.net>
Thu, 18 Aug 2011 13:22:17 +0000 (09:22 -0400)
1  2 
Open-ILS/src/Makefile.am
Open-ILS/src/perlmods/MANIFEST

diff --combined Open-ILS/src/Makefile.am
@@@ -34,16 -34,8 +34,8 @@@ supportscr = @srcdir@/support-script
  
  # Collect files to be used by multiple targets
  
- autojsbinscripts = @srcdir@/extras/fieldmapper.pl \
-        @srcdir@/extras/locale_html_options.pl \
-        @srcdir@/extras/org_tree_js.pl \
-        @srcdir@/extras/org_lasso_js.pl \
-        @srcdir@/extras/facet_types_js.pl \
-        @srcdir@/extras/org_tree_html_options.pl \
-        @srcdir@/extras/org_tree_proximity.pl \
-        @srcdir@/extras/autogen.sh \
-        @srcdir@/extras/cache-generator.sh \
-        @srcdir@/support-scripts/offline-blocked-list.pl 
+ autojsbinscripts = @srcdir@/extras/autogen.sh \
+       @srcdir@/support-scripts/offline-blocked-list.pl 
  
  # Decide which entities to build
  
@@@ -168,9 -160,6 +160,9 @@@ uninstall-hook
  ilscore-install:
        @echo $@
        $(MKDIR_P) $(DESTDIR)$(TEMPLATEDIR)
 +      cp -r @srcdir@/templates/base.tt2 $(DESTDIR)$(TEMPLATEDIR)
 +      cp -r @srcdir@/templates/login.tt2 $(DESTDIR)$(TEMPLATEDIR)
 +      cp -r @srcdir@/templates/default $(DESTDIR)$(TEMPLATEDIR)
        cp -r @srcdir@/templates/marc $(DESTDIR)$(TEMPLATEDIR)
        cp -r @srcdir@/templates/password-reset $(DESTDIR)$(TEMPLATEDIR)
        @echo "Installing string templates to $(DESTDIR)$(TEMPLATEDIR)"
@@@ -126,10 -126,10 +126,11 @@@ lib/OpenILS/SIP/Transaction.p
  lib/OpenILS/SIP/Transaction/Checkin.pm
  lib/OpenILS/SIP/Transaction/Checkout.pm
  lib/OpenILS/SIP/Transaction/Renew.pm
 +lib/Template/Plugin/ResolverResolver.pm
  lib/OpenILS/Template/Plugin/Unicode.pm
  lib/OpenILS/Template/Plugin/WebSession.pm
  lib/OpenILS/Template/Plugin/WebUtils.pm
+ lib/OpenILS/Utils/Configure.pm
  lib/OpenILS/Utils/Cronscript.pm
  lib/OpenILS/Utils/Cronscript.pm.in
  lib/OpenILS/Utils/CStoreEditor.pm