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

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: chrism-install-branch
	Makefile.in 
Log Message:
Arrange to pass -q for older, less discrete versions of distutils
(2.3 does the right thing already).

Pass -v1 to testrunner.py so it isn't so incredibly noisy.


=== Zope/inst/Makefile.in 1.1.2.17 => 1.1.2.18 ===
--- Zope/inst/Makefile.in:1.1.2.17	Fri Jan 24 12:58:36 2003
+++ Zope/inst/Makefile.in	Fri Jan 24 16:52:31 2003
@@ -29,6 +29,7 @@
 TOUCH=touch
 INSTALL_COPY="${PYTHON}" "${INST_DIR}/install.py" --copylinks
 WRITE_INFILE="${PYTHON}" "${INST_DIR}/file_from_infile.py"
+DISTUTILS_OPTS=<<DISTUTILS_OPTS>>
 
 .PHONY : clean install uninstall instance links hacklinks untestinst testinst
 .PHONY : default
@@ -40,7 +41,7 @@
 	@echo
 
 build: hacklinks links
-	"${PYTHON}" "${INST_DIR}/setup.py" build_ext -i
+	"${PYTHON}" "${INST_DIR}/setup.py" ${DISTUTILS_OPTS} build_ext -i
 
 # Zope has a number of directories in its top-level source checkout
 # which should really be treated as subdirectories of two "skeleton"
@@ -91,7 +92,8 @@
 	${INSTALL_COPY} "${SKEL_DIR}" "${TARGET_DIR}"
 	${WRITE_INFILE} "${INFILE_DIR}/mkzopeinst.py.in" \
            "${TARGET_DIR}/inst/mkzopeinst.py"
-	"${PYTHON}" inst/setup.py install --home="${TARGET_DIR}" ${OPT_FLAGS}
+	"${PYTHON}" inst/setup.py ${DISTUTILS_OPTS} install \
+	   --home="${TARGET_DIR}" ${OPT_FLAGS}
 	@echo
 	@echo Zope binaries installed successfully.
 	@echo Now run \'${TARGET_DIR}/inst/mkzopeinst.py\'
@@ -142,7 +144,7 @@
 
 test: build
 	${CD} "${BUILD_DIR}/lib/python" && ${PYTHON} \
-           ../../utilities/testrunner.py -a
+           ../../utilities/testrunner.py -v1 -a
 
 clean: rmlinks
 	${RM} "${BUILD_DIR}/build"