[Zope-Checkins] CVS: Zope/inst - Makefile.in:1.8 configure.py:1.7

[Chris McDonough]

Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv22104/inst

Modified Files:
	Makefile.in configure.py 
Log Message:
Change directories for build-tmp, build-lib, and build-scripts so they don't get copied to the install directory during 'make install'.

Also, change 'make clean' to remove '.so' files and not try to remove core files.


=== Zope/inst/Makefile.in 1.7 => 1.8 ===
--- Zope/inst/Makefile.in:1.7	Tue Apr  8 12:02:04 2003
+++ Zope/inst/Makefile.in	Thu Jun 12 23:55:22 2003
@@ -15,11 +15,10 @@
 BUILD_BASE=<<BUILD_BASE>>
 DISTUTILS_OPTS=<<DISTUTILS_OPTS>>
 INSTALL_FLAGS=<<INSTALL_FLAGS>>
-BUILD_SUBDIR=build
 BUILD_FLAGS=--build-base="${BUILD_BASE}" \
-            --build-lib="${BUILD_BASE}/${BUILD_SUBDIR}" \
-            --build-scripts="${BUILD_BASE}/${BUILD_SUBDIR}/build_scripts.tmp" \
-            --build-temp="${BUILD_BASE}/${BUILD_SUBDIR}/build_temp.tmp"
+            --build-lib="${BUILD_BASE}/build-lib" \
+            --build-scripts="${BUILD_BASE}/build-scripts"\
+            --build-temp="${BUILD_BASE}/build-temp"
 
 RM=rm -f
 RMRF=rm -rf
@@ -78,8 +77,8 @@
 	${PYTHON} "${BASE_DIR}/utilities/testrunner.py" ${TESTOPTS}
 
 clean:
-	${RMRF} "${BUILD_BASE}/${BUILD_SUBDIR}"
-	${FIND} "${BASE_DIR}" -name '*.py[co]' -o -name 'core*' | ${XARGS} ${RM}
+	${RMRF} "${BUILD_BASE}"
+	${FIND} "${BASE_DIR}" \
+         -name '*.py[co]' -o -name '*.so' -o -name '*.o' | ${XARGS} ${RM}
 
 clobber: clean untestinst
-	${FIND} "${BASE_DIR}/lib/python" -name '*.so' | ${XARGS} ${RM}


=== Zope/inst/configure.py 1.6 => 1.7 ===
--- Zope/inst/configure.py:1.6	Thu Mar 27 09:57:30 2003
+++ Zope/inst/configure.py	Thu Jun 12 23:55:22 2003
@@ -32,7 +32,7 @@
     # below assumes this script is in the BASE_DIR/inst directory
     global PREFIX
     BASE_DIR=os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0])))
-    BUILD_BASE=os.getcwd()
+    BUILD_BASE=os.path.join(os.getcwd(), 'build-base')
     PYTHON=sys.executable
     MAKEFILE=open(os.path.join(BASE_DIR, 'inst', IN_MAKEFILE)).read()
     REQUIRE_LF_ENABLED = 1
@@ -83,7 +83,7 @@
         }
     for k,v in idata.items():
         MAKEFILE = MAKEFILE.replace(k, v)
-    f = open(os.path.join(BUILD_BASE, 'makefile'), 'w')
+    f = open(os.path.join(os.getcwd(), 'makefile'), 'w')
     f.write(MAKEFILE)
     print "  - Makefile written."
     print