From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 20 Dec 2007 20:14:13 +0000 (+0000)
Subject: Add install option for Python libs
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=20d3a01a4bf12a3500201236e081f7b0fd98ead8;p=Evergreen.git

Add install option for Python libs


git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8255 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index e47405cca6..ab499ae398 100644
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -10,7 +10,7 @@ export STAFF_CLIENT_BUILD_ID = `/bin/cat ../xul/staff_client/build/BUILD_ID`
 
 all:  c_apps client-xul mod_xmlent
 
-install:	perl-install web-install server-xul string-templates-install xsl-install c_apps-install circ_rules-install offline-install storage-bootstrap cgi-bootstrap
+install:	perl-install python-install web-install server-xul string-templates-install xsl-install c_apps-install circ_rules-install offline-install storage-bootstrap cgi-bootstrap
 
 web-install:	webcore-install autojs-install mod_xmlent-install offline-install reporter-install
 
@@ -138,6 +138,12 @@ perl-install:
 	mkdir -p $(TEMPLATEDIR)
 	cp -r templates/marc $(TEMPLATEDIR)
 
+python-install:
+	@echo $@
+	@echo "Installing Python modules to $(PYTHONDIR)"
+	mkdir -p $(PYTHONDIR)
+	cp -r python/* $(PYTHONDIR)
+
 # -----------------------------------------------------------------------------------
 
 reporter-install:
diff --git a/install.conf.default b/install.conf.default
index 3133a886cc..d6822c54de 100644
--- a/install.conf.default
+++ b/install.conf.default
@@ -44,6 +44,7 @@ PREFIX="/openils/";
 BINDIR="$PREFIX/bin/";
 LIBDIR="$PREFIX/lib/";
 PERLDIR="$LIBDIR/perl5/";
+PYTHONDIR="$LIBDIR/python25/";
 INCLUDEDIR="$PREFIX/include/";
 ETCDIR="$PREFIX/etc/";
 WEBDIR="$PREFIX/web/";
diff --git a/install.sh b/install.sh
index 8b57a24a1e..4abae27776 100755
--- a/install.sh
+++ b/install.sh
@@ -119,7 +119,7 @@ function runInstall {
 
 		MAKE="make $verbose APXS2=$APXS2 PREFIX=$PREFIX TMP=$TMP APR_HEADERS=$APR_HEADERS \
 			APACHE2_HEADERS=$APACHE2_HEADERS LIBXML2_HEADERS=$LIBXML2_HEADERS DBPORT=$DBPORT\
-			BINDIR=$BINDIR DBI_LIBS=$DBI_LIBS LIBDIR=$LIBDIR PERLDIR=$PERLDIR INCLUDEDIR=$INCLUDEDIR \
+			BINDIR=$BINDIR DBI_LIBS=$DBI_LIBS LIBDIR=$LIBDIR PERLDIR=$PERLDIR PYTHONDIR=$PYTHONDIR INCLUDEDIR=$INCLUDEDIR \
 			WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR REPORTERDIR=$REPORTERDIR\
 			OPENSRF_HEADERS=$OPENSRF_HEADERS OPENSRF_LIBS=$OPENSRF_LIBS OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR \
 			CIRCRULESDIR=$CIRCRULESDIR CATALOGSCRIPTDIR=$CATALOGSCRIPTDIR CGIDIR=$CGIDIR \
@@ -142,6 +142,7 @@ function runInstall {
 				if building; then $MAKE -C "$OPENILSDIR" "c_apps"; fi;
 				if installing; then 
 					$MAKE -C "$OPENILSDIR" "perl-install"; 
+					$MAKE -C "$OPENILSDIR" "python-install"; 
 					$MAKE -C "$OPENILSDIR" "string-templates-install"; 
 					$MAKE -C "$OPENILSDIR" "xsl-install"; 
 					$MAKE -C "$OPENILSDIR" "c_apps-install";