Merged Zope-2_9-branch r40893:40894 into the trunk.

(Reverted r40251 as I quite obviously didn't know what I was doing.)

inst/Makefile.in

@@ -48,7 +48,7 @@ build:
 install: version_txt
 	${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} \
 	   build_ext ${BUILD_FLAGS} \
-	   install --home="${PREFIX}" ${INSTALL_FLAGS}
+	   install --skip-build --home="${PREFIX}" ${INSTALL_FLAGS}
 	[ -f ${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${PREFIX}/bin/python
 	@echo
 	@echo Zope binaries installed successfully.