From f834489b244e9d94b959635fd9079f98da6c0f4b Mon Sep 17 00:00:00 2001 From: dbs Date: Tue, 15 Jan 2008 17:42:45 +0000 Subject: [PATCH 1/1] Add a build flag for Python modules git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1216 9efc2488-bf62-4759-914b-345cdb29e865 --- install.conf | 9 ++++++--- src/Makefile | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/install.conf b/install.conf index b0fd79b..4c57c19 100644 --- a/install.conf +++ b/install.conf @@ -8,12 +8,12 @@ export SOCK=/openils/var/sock 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 @@ export OSRF_LEGACY_JSON=1 # 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 diff --git a/src/Makefile b/src/Makefile index 98704b7..b6209a2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -69,7 +69,7 @@ java: prep 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 @@ perl-install: install-prep 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; -- 2.43.2