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

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: new-install-branch
	Makefile.in 
Log Message:
- simplify: use the new bin/mkzopeinstance script
- remove unused --copylinks option from install.py command line


=== Zope/inst/Makefile.in 1.1.4.1 => 1.1.4.2 ===
--- Zope/inst/Makefile.in:1.1.4.1	Thu Feb 13 18:13:48 2003
+++ Zope/inst/Makefile.in	Fri Feb 14 13:06:30 2003
@@ -18,7 +18,6 @@
 OPT_FLAGS=<<OPT_FLAGS>>
 INST_DIR=${BUILD_DIR}/inst
 SKEL_DIR=${BUILD_DIR}/skel
-INFILE_DIR=${INST_DIR}/in
 RM=rm -f
 RMRF=rm -rf
 FIND=find
@@ -26,7 +25,7 @@
 CD=cd
 LN=ln -sf
 CP=cp
-INSTALL_COPY="${PYTHON}" "${INST_DIR}/install.py" --copylinks
+INSTALL_COPY="${PYTHON}" "${INST_DIR}/install.py"
 WRITE_INFILE="${PYTHON}" "${INST_DIR}/file_from_infile.py"
 DISTUTILS_OPTS=<<DISTUTILS_OPTS>>
 
@@ -44,24 +43,20 @@
 
 install: build
 	${INSTALL_COPY} "${SKEL_DIR}" "${TARGET_DIR}"
-	${WRITE_INFILE} "${INFILE_DIR}/mkzopeinst.py.in" \
-           "${TARGET_DIR}/inst/mkzopeinst.py"
 	"${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\'
+	@echo Now run \'${TARGET_DIR}/bin/mkzopeinstance\'
 
 instance: build
-	"${PYTHON}" "${SKEL_DIR}/inst/mkzopeinst.py" \
-          --zopehome="${BUILD_DIR}"
+	"${PYTHON}" "${BUILD_DIR}/bin/mkzopeinstance" "${BUILD_DIR}"
 
 # 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}" "${SKEL_DIR}/inst/mkzopeinst.py" \
-          --zopehome="${BUILD_DIR}" --insthome="${BUILD_DIR}" \
+	"${PYTHON}" "${BUILD_DIR}/bin/mkzopeinstance" "${BUILD_DIR}" \
           --inituser=
 
 # remove the instance files made with testinst (w/ prejudice)