From c4cc07ff2b820f69b6c78d8b226abd1cbbfa88e5 Mon Sep 17 00:00:00 2001
From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 7 Jan 2008 01:05:01 +0000
Subject: [PATCH] Enable Python build with regular user to avoid perm problems
 at clean time.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8341 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/Makefile        |  8 +++++++-
 Open-ILS/src/python/Makefile | 22 ++++++++++++++--------
 install.sh                   |  6 +++++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index 9e219905f0..d7782c8654 100644
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -8,7 +8,7 @@ export INCDIR = "$(INCLUDEDIR)/openils/"
 
 export STAFF_CLIENT_BUILD_ID = `/bin/cat ../xul/staff_client/build/BUILD_ID`
 
-all:  c_apps client-xul mod_xmlent
+all:  c_apps client-xul mod_xmlent python-build
 
 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
 
@@ -138,6 +138,12 @@ perl-install:
 	mkdir -p $(TEMPLATEDIR)
 	cp -r templates/marc $(TEMPLATEDIR)
 
+# ------------------------------------------------------------------------------
+
+python-build:
+	@echo $@
+	make -C python build
+
 # -----------------------------------------------------------------------------------
 
 python-install:
diff --git a/Open-ILS/src/python/Makefile b/Open-ILS/src/python/Makefile
index ec18882752..9eafc3c793 100644
--- a/Open-ILS/src/python/Makefile
+++ b/Open-ILS/src/python/Makefile
@@ -1,16 +1,22 @@
-# vim:noet:ts=4
+# makefile for OpenSRF Python modules and scripts
 
-install: python-install
-
-python-build:
+# ------------------------------------------------------------------------------
+# BUILD
+# ------------------------------------------------------------------------------
+build:
 	@echo $@
 	python setup.py build
 
-python-install:
+# ------------------------------------------------------------------------------
+# INSTALL
+# ------------------------------------------------------------------------------
+install:	build
 	@echo $@
 	python setup.py install
 
+# ------------------------------------------------------------------------------
+# CLEAN	
+# ------------------------------------------------------------------------------
 clean:
-	@echo $@
-	rm -fr build
-	find . -name "*.pyc" -exec rm -f {} \;
+	/bin/rm -rf build 
+
diff --git a/install.sh b/install.sh
index 8b57a24a1e..18da78311d 100755
--- a/install.sh
+++ b/install.sh
@@ -139,9 +139,13 @@ function runInstall {
 				;;
 
 			"openils_core" )
-				if building; then $MAKE -C "$OPENILSDIR" "c_apps"; fi;
+				if building; then 
+					$MAKE -C "$OPENILSDIR" "c_apps";
+					$MAKE -C "$OPENILSDIR" "python-build";
+				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"; 
-- 
2.43.2