[Zope-Checkins] CVS: Zope/inst - Makefile.in:1.1.4.4

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: new-install-branch
	Makefile.in 
Log Message:
various small cleanups; attempting to be more surgical


=== Zope/inst/Makefile.in 1.1.4.3 => 1.1.4.4 ===
--- Zope/inst/Makefile.in:1.1.4.3	Fri Feb 14 14:45:35 2003
+++ Zope/inst/Makefile.in	Fri Feb 14 17:49:58 2003
@@ -57,10 +57,10 @@
 
 # remove the instance files made with testinst (w/ prejudice)
 untestinst:
-	${RMRF} "${BUILD_DIR}/bin/zopectl.py"
-	${RMRF} "${BUILD_DIR}/bin/ntservice.py"
+	${RM} "${BUILD_DIR}/bin/zopectl.py"
+	${RM} "${BUILD_DIR}/bin/ntservice.py"
 	${RMRF} "${BUILD_DIR}/etc"
-	${RMRF} "${BUILD_DIR}/Products"
+	${RMRF} "${BUILD_DIR}/log"
 
 rpmdist: clean
 	${RM} "${RPM_SRC_DIR}/${PACKAGE_NAME}"
@@ -74,17 +74,14 @@
 uninstall:
 	${RMRF} "${TARGET_DIR}"
 
-TESTOPTS=-av1
+TESTOPTS=-v1 -d lib/python
 
 test: build
-	${CD} "${BUILD_DIR}/lib/python" && ${PYTHON} \
-           ../../utilities/testrunner.py ${TESTOPTS}
+	${PYTHON} utilities/testrunner.py ${TESTOPTS}
 
 clean:
-	${RM} "${BUILD_DIR}/build"
-	${FIND} "${BUILD_DIR}" -name '*.so' -o -name \
-          '*.py[co]' -o -name 'core*' | ${XARGS} rm -f
-
-clobber: clean
-	${RMRF} bin/ etc/
-	${RM} start stop inituser
+	${RMRF} "${BUILD_DIR}/build" "${BUILD_DIR}/lib/python/build"
+	${FIND} "${BUILD_DIR}" \
+	  -name '*.py[co]' -o -name 'core*' | ${XARGS} rm -f
+
+clobber: clean untestinst