[Opensrf-commits] r1216 - in trunk: . src

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-01-15 12:42:45 -0500 (Tue, 15 Jan 2008)
New Revision: 1216

Modified:
   trunk/install.conf
   trunk/src/Makefile
Log:
Add a build flag for Python modules


Modified: trunk/install.conf
===================================================================
--- trunk/install.conf	2008-01-15 17:37:11 UTC (rev 1215)
+++ trunk/install.conf	2008-01-15 17:42:45 UTC (rev 1216)
@@ -8,12 +8,12 @@
 export PID=/openils/var/pid
 export LOG=/openils/var/log
 export TMP=/tmp/ilstemp
-export APXS2=/usr/bin/apxs2
+export APXS2=/usr/sbin/apxs2
 export APACHE2_HEADERS=/usr/include/apache2
-export APR_HEADERS=/usr/include/apr-1.0
+export APR_HEADERS=/usr/include/apr-1
 export LIBXML2_HEADERS=/usr/include/libxml2
 
-# uncoment to create the legacy JSON headers and .so file for backwards compatibility
+# uncomment to create the legacy JSON headers and .so file for backwards compatibility
 export OSRF_LEGACY_JSON=1
 
 # uncomment to build and install the java libs
@@ -21,3 +21,6 @@
 
 # path to the directory containing the Java dependency jar files
 #export OSRF_JAVA_DEPSDIR=/opt/java
+
+# uncomment to build and install the Python modules
+#export OSRF_INSTALL_PYTHON=1

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2008-01-15 17:37:11 UTC (rev 1215)
+++ trunk/src/Makefile	2008-01-15 17:42:45 UTC (rev 1216)
@@ -69,7 +69,7 @@
 	if [ -n "$(OSRF_INSTALL_JAVA)" ]; then echo $@; cd java && . deps.inc && make; fi;
 
 python-build:
-	make -C python build
+	if [ -n "$(OSRF_INSTALL_PYTHON)" ]; then echo $@; make -C python build; fi;
 
 # --------------------------------------------------------------------------------
 # INSTALL
@@ -126,7 +126,7 @@
 	cp -r perlmods/* $(PERLDIR)/
 
 python-install:
-	make -C python install
+	if [ -n "$(OSRF_INSTALL_PYTHON)" ]; then echo $@; make -C python install; fi;
 
 java-install:
 	if [ -n "$(OSRF_INSTALL_JAVA)" ]; then echo $@; cd java && . deps.inc && make install; fi;