evergreen-ils/evergreen-ils.patch

   1 diff -rup Evergreen-ILS-2.0.6/Open-ILS//src/apachemods/Makefile.am src/Evergreen-ILS-2.0.6/Open-ILS/src/apachemods/Makefile.am
   2 --- Evergreen-ILS-2.0.6/Open-ILS//src/apachemods/Makefile.am    2009-10-29 01:00:26.000000000 +0000
   3 +++ src/Evergreen-ILS-2.0.6/Open-ILS/src/apachemods/Makefile.am 2011-06-07 19:11:54.015880557 +0100
   4 @@ -6,6 +6,7 @@
   5
   6  AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/Open-ILS/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) -I$(OPENSRF_HEADERS)
   7  AM_LDFLAGS = -L$(LIBDIR) -L$(OPENSRF_LIBS)
   8 +AP_LIBEXECDIR = `$(APXS2) -q LIBEXECDIR`
   9
  10  if BUILDAPACHEMODS
  11  OILSAPACHEINST = apachemods
  12 @@ -14,10 +15,11 @@ endif
  13  install-exec-local: $(OILSAPACHEINST)
  14
  15  apachemods:
  16 +       $(MKDIR_P) $(DESTDIR)$(AP_LIBEXECDIR)
  17         $(APXS2) -c $(AM_LDFLAGS) -lxml2 -lopensrf -lxslt -lexpat $(AM_CFLAGS) @srcdir@/mod_xmlent.c
  18 -       $(APXS2) -i -a @srcdir@/mod_xmlent.la
  19 +       $(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/mod_xmlent.la
  20         $(APXS2) -c $(AM_LDFLAGS) -lxml2 -lopensrf -lxslt -lexpat $(AM_CFLAGS) @srcdir@/mod_idlchunk.c
  21 -       $(APXS2) -i -a @srcdir@/mod_idlchunk.la
  22 +       $(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/mod_idlchunk.la
  23
  24  clean-local:
  25         rm -f @srcdir@/mod_xmlent.la @srcdir@/mod_xmlent.lo @srcdir@/mod_xmlent.slo
  26 diff -rup Evergreen-ILS-2.0.6/Open-ILS//src/Makefile.am src/Evergreen-ILS-2.0.6/Open-ILS/src/Makefile.am
  27 --- Evergreen-ILS-2.0.6/Open-ILS//src/Makefile.am       2010-10-20 14:26:37.000000000 +0100
  28 +++ src/Evergreen-ILS-2.0.6/Open-ILS/src/Makefile.am    2011-06-07 19:27:23.404065099 +0100
  29 @@ -149,7 +149,7 @@ EXTRA_DIST = @srcdir@/perlmods @srcdir@/
  30
  31  # Install header files
  32
  33 -oilsincludedir = $(DESTDIR)@includedir@/openils
  34 +oilsincludedir = @includedir@/openils
  35  headsdir = @top_srcdir@/Open-ILS/include/openils
  36  oilsinclude_HEADERS = $(headsdir)/idl_fieldmapper.h $(headsdir)/oils_constants.h $(headsdir)/oils_event.h $(headsdir)/oils_idl.h $(headsdir)/oils_utils.h
  37
  38 @@ -168,17 +168,17 @@ uninstall-hook:
  39  ilscore-install:
  40         @echo $@
  41         @echo "Installing Perl modules"
  42 -       $(MKDIR_P) $(perldir)
  43 -       $(MKDIR_P) $(TEMPLATEDIR)
  44 +       $(MKDIR_P) $(DESTDIR)$(perldir)
  45 +       $(MKDIR_P) $(DESTDIR)$(TEMPLATEDIR)
  46 -       cp -r @srcdir@/perlmods/* $(perldir)
  47 -       cp -r @srcdir@/templates/marc $(TEMPLATEDIR)
  48 -       cp -r @srcdir@/templates/password-reset $(TEMPLATEDIR)
  49 +       cp -r @srcdir@/perlmods/* $(DESTDIR)$(perldir)
  50 +       cp -r @srcdir@/templates/marc $(DESTDIR)$(TEMPLATEDIR)
  51 +       cp -r @srcdir@/templates/password-reset $(DESTDIR)$(TEMPLATEDIR)
  52         sed -i 's|SYSCONFDIR|@sysconfdir@|g' '$(DESTDIR)@libdir@/perl5/OpenILS/WWW/Web.pm'
  53         sed -i 's|SYSCONFDIR|@sysconfdir@|g' '$(DESTDIR)@libdir@/perl5/OpenILS/WWW/Method.pm'
  54 -       @echo "Installing string templates to $(TEMPLATEDIR)"
  55 -       $(MKDIR_P) $(TEMPLATEDIR)
  56 -       $(MKDIR_P) $(datadir)/overdue/
  57 +       @echo "Installing string templates to $(DESTDIR)$(TEMPLATEDIR)"
  58 +       $(MKDIR_P) $(DESTDIR)$(TEMPLATEDIR)
  59 +       $(MKDIR_P) $(DESTDIR)$(datadir)/overdue/
  60 -       cp -r @srcdir@/templates/strings $(TEMPLATEDIR)
  61 +       cp -r @srcdir@/templates/strings $(DESTDIR)$(TEMPLATEDIR)
  62         sed -i 's|LOCALSTATEDIR|@localstatedir@|g' '$(DESTDIR)@sysconfdir@/oils_sip.xml.example'
  63         sed -i 's|SYSCONFDIR|@sysconfdir@|g' '$(DESTDIR)@sysconfdir@/oils_sip.xml.example'
  64         sed -i 's|LOCALSTATEDIR|@localstatedir@|g' '$(DESTDIR)@sysconfdir@/opensrf_core.xml.example'
  65 diff -rup Evergreen-ILS-2.0.6/Open-ILS//web/Makefile.am src/Evergreen-ILS-2.0.6/Open-ILS/web/Makefile.am
  66 --- Evergreen-ILS-2.0.6/Open-ILS//web/Makefile.am       2010-09-13 22:18:45.000000000 +0100
  67 +++ src/Evergreen-ILS-2.0.6/Open-ILS/web/Makefile.am    2011-06-07 19:31:59.562170024 +0100
  68 @@ -11,1 +11,1 @@
  69 -reportsdir = $(DESTDIR)$(WEBDIR)/reports/
  70 +reportsdir = $(WEBDIR)/reports/
  71 @@ -62,7 +62,7 @@ offline-install:
  72         @echo "Installing offline CGIs to $(CGIDIR)/offline";
  73         $(MKDIR_P) $(TMP)
  74         $(MKDIR_P) $(DESTDIR)$(CGIDIR)/offline;
  75 -       $(MKDIR_P) $(datadir)/offline;
  76 +       $(MKDIR_P) $(DESTDIR)$(datadir)/offline;
  77         perl -pe "s{##CONFIG##}{@sysconfdir@}" < @top_srcdir@/Open-ILS/src/offline/offline.pl > $(TMP)/offline.pl;
  78         cp $(TMP)/offline.pl $(DESTDIR)$(CGIDIR)/offline/
  79         chmod +x $(DESTDIR)$(CGIDIR)/offline/offline.pl
  80 diff -rup Evergreen-ILS-2.0.6/Open-ILS//xul/staff_client/Makefile.am src/Evergreen-ILS-2.0.6/Open-ILS/xul/staff_client/Makefile.am
  81 --- Evergreen-ILS-2.0.6/Open-ILS//xul/staff_client/Makefile.am  2010-03-24 19:43:49.000000000 +0000
  82 +++ src/Evergreen-ILS-2.0.6/Open-ILS/xul/staff_client/Makefile.am       2011-06-07 19:49:14.484247782 +0100
  83 @@ -109,9 +109,9 @@ server-xul: build
  84 -       mkdir -p $(WEBDIR)
  85 -       mkdir -p $(WEBDIR)/xul/
  86 +       mkdir -p $(DESTDIR)$(WEBDIR)
  87 +       mkdir -p $(DESTDIR)$(WEBDIR)/xul/
  88         @echo "BUILD_ID = $(STAFF_CLIENT_BUILD_ID)"
  89 -       @echo "Copying xul into $(WEBDIR)/xul/$(STAFF_CLIENT_BUILD_ID)"
  90 -       mkdir -p "$(WEBDIR)/xul/$(STAFF_CLIENT_BUILD_ID)"
  91 -       cp -R @top_srcdir@/Open-ILS/xul/staff_client/build/server "${WEBDIR}/xul/${STAFF_CLIENT_BUILD_ID}/"
  92 +       @echo "Copying xul into $(DESTDIR)$(WEBDIR)/xul/$(STAFF_CLIENT_BUILD_ID)"
  93 +       mkdir -p "$(DESTDIR)$(WEBDIR)/xul/$(STAFF_CLIENT_BUILD_ID)"
  94 +       cp -R @top_srcdir@/Open-ILS/xul/staff_client/build/server "$(DESTDIR)${WEBDIR}/xul/${STAFF_CLIENT_BUILD_ID}/"
  95
  96  compress-javascript: build
  97         @echo "Size of build/ before compression = " `du -sh build/`
  98 --- Evergreen-ILS-2.0.6/Open-ILS/src/python/Makefile.am 2011-07-18 11:27:47.207425788 +0100
  99 +++ src/Evergreen-ILS-2.0.6/Open-ILS/src/ptyhon/Makefile.am     2011-07-18 11:28:05.413447059 +0100
 100 @@ -2,13 +2,13 @@
 101
 102  all-local:
 103         @echo $@
 104 -       python @srcdir@/setup.py build
 105 +       python2 @srcdir@/setup.py build
 106
 107  # ------------------------------------------------------------------------------
 108  # INSTALL
 109  # ------------------------------------------------------------------------------
 110  install-data-local:
 111         @echo $@
 112 -       python @srcdir@/setup.py install
 113 +       python2 @srcdir@/setup.py install --root=$(DESTDIR)///
 114
 115