[open-ils-commits] r8255 - in branches/acq-experiment: . Open-ILS/src

[svn at svn.open-ils.org]

Author: dbs
Date: 2007-12-20 15:14:13 -0500 (Thu, 20 Dec 2007)
New Revision: 8255

Modified:
   branches/acq-experiment/Open-ILS/src/Makefile
   branches/acq-experiment/install.conf.default
   branches/acq-experiment/install.sh
Log:
Add install option for Python libs


Modified: branches/acq-experiment/Open-ILS/src/Makefile
===================================================================
--- branches/acq-experiment/Open-ILS/src/Makefile	2007-12-20 19:40:56 UTC (rev 8254)
+++ branches/acq-experiment/Open-ILS/src/Makefile	2007-12-20 20:14:13 UTC (rev 8255)
@@ -10,7 +10,7 @@
 
 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 @@
 	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:

Modified: branches/acq-experiment/install.conf.default
===================================================================
--- branches/acq-experiment/install.conf.default	2007-12-20 19:40:56 UTC (rev 8254)
+++ branches/acq-experiment/install.conf.default	2007-12-20 20:14:13 UTC (rev 8255)
@@ -44,6 +44,7 @@
 BINDIR="$PREFIX/bin/";
 LIBDIR="$PREFIX/lib/";
 PERLDIR="$LIBDIR/perl5/";
+PYTHONDIR="$LIBDIR/python25/";
 INCLUDEDIR="$PREFIX/include/";
 ETCDIR="$PREFIX/etc/";
 WEBDIR="$PREFIX/web/";

Modified: branches/acq-experiment/install.sh
===================================================================
--- branches/acq-experiment/install.sh	2007-12-20 19:40:56 UTC (rev 8254)
+++ branches/acq-experiment/install.sh	2007-12-20 20:14:13 UTC (rev 8255)
@@ -119,7 +119,7 @@
 
 		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 @@
 				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";