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

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: new-install-branch
	Makefile.in 
Log Message:
- fix the "clobber" target to get rid of compiled C modules
- lots of simplifications


=== Zope/inst/Makefile.in 1.1.4.4 => 1.1.4.5 ===
--- Zope/inst/Makefile.in:1.1.4.4	Fri Feb 14 17:49:58 2003
+++ Zope/inst/Makefile.in	Thu Feb 20 17:44:27 2003
@@ -15,7 +15,6 @@
 PYTHON=<<PYTHON>>
 TARGET_DIR=<<TARGET_DIR>>
 BUILD_DIR=<<BUILD_DIR>>
-INST_DIR=${BUILD_DIR}/inst
 RM=rm -f
 RMRF=rm -rf
 FIND=find
@@ -23,8 +22,8 @@
 CD=cd
 LN=ln -sf
 CP=cp
-INSTALL_COPY="${PYTHON}" "${INST_DIR}/install.py"
-WRITE_INFILE="${PYTHON}" "${INST_DIR}/file_from_infile.py"
+INSTALL_COPY="${PYTHON}" inst/install.py
+WRITE_INFILE="${PYTHON}" inst/file_from_infile.py
 
 .PHONY : clean install uninstall instance links hacklinks untestinst testinst
 .PHONY : default
@@ -36,7 +35,7 @@
 	@echo
 
 build:
-	"${PYTHON}" "${INST_DIR}/setup.py" <<DISTUTILS_OPTS>> build_ext -i
+	"${PYTHON}" inst/setup.py <<DISTUTILS_OPTS>> build_ext -i
 
 install: build
 	"${PYTHON}" inst/setup.py <<DISTUTILS_OPTS>> install \
@@ -46,28 +45,27 @@
 	@echo Now run \'${TARGET_DIR}/bin/mkzopeinstance\'
 
 instance: build
-	"${PYTHON}" "${BUILD_DIR}/bin/mkzopeinstance" "${BUILD_DIR}"
+	"${PYTHON}" bin/mkzopeinstance .
 
 # testinst makes an instance home in the build directory without asking
 # any questions.  this is useful when testing.  instances made with
 # this can be removed via "make untestinst"
 testinst: build
-	"${PYTHON}" "${BUILD_DIR}/bin/mkzopeinstance" "${BUILD_DIR}" \
-          --inituser=
+	"${PYTHON}" bin/mkzopeinstance . --inituser=
 
 # remove the instance files made with testinst (w/ prejudice)
 untestinst:
-	${RM} "${BUILD_DIR}/bin/zopectl.py"
-	${RM} "${BUILD_DIR}/bin/ntservice.py"
-	${RMRF} "${BUILD_DIR}/etc"
-	${RMRF} "${BUILD_DIR}/log"
+	${RM} bin/zopectl.py
+	${RM} bin/ntservice.py
+	${RMRF} etc
+	${RMRF} log
 
 rpmdist: clean
 	${RM} "${RPM_SRC_DIR}/${PACKAGE_NAME}"
 	${RM} "${RPM_SRC_DIR}/${PACKAGE_NAME}.spec"
 	${LN} "${BUILD_DIR}" "${RPM_SRC_DIR}/${PACKAGE_NAME}"
 	cd "${RPM_SRC_DIR}" && tar cvzfh ${PACKAGE_NAME}.tar.gz ${PACKAGE_NAME}
-	${WRITE_INFILE} "${INST_DIR}/Zope.spec.in" \
+	${WRITE_INFILE} inst/Zope.spec.in \
               "${RPM_SRC_DIR}/${PACKAGE_NAME}.spec"
 	cd ${RPM_SRC_DIR} && rpm -ba ${PACKAGE_NAME}.spec
 
@@ -80,8 +78,8 @@
 	${PYTHON} utilities/testrunner.py ${TESTOPTS}
 
 clean:
-	${RMRF} "${BUILD_DIR}/build" "${BUILD_DIR}/lib/python/build"
-	${FIND} "${BUILD_DIR}" \
-	  -name '*.py[co]' -o -name 'core*' | ${XARGS} rm -f
+	${RMRF} build lib/python/build
+	${FIND} . -name '*.py[co]' -o -name 'core*' | ${XARGS} ${RM}
 
 clobber: clean untestinst
+	${FIND} lib/python -name '*.so' | ${XARGS} ${RM}