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

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: new-install-branch
	Makefile.in 
Log Message:
Simplify!
- use less indirection when it adds nothing
- don't install the skel/ directory separately; setup.py handles that


=== Zope/inst/Makefile.in 1.1.4.2 => 1.1.4.3 ===
--- Zope/inst/Makefile.in:1.1.4.2	Fri Feb 14 13:06:30 2003
+++ Zope/inst/Makefile.in	Fri Feb 14 14:45:35 2003
@@ -15,9 +15,7 @@
 PYTHON=<<PYTHON>>
 TARGET_DIR=<<TARGET_DIR>>
 BUILD_DIR=<<BUILD_DIR>>
-OPT_FLAGS=<<OPT_FLAGS>>
 INST_DIR=${BUILD_DIR}/inst
-SKEL_DIR=${BUILD_DIR}/skel
 RM=rm -f
 RMRF=rm -rf
 FIND=find
@@ -27,7 +25,6 @@
 CP=cp
 INSTALL_COPY="${PYTHON}" "${INST_DIR}/install.py"
 WRITE_INFILE="${PYTHON}" "${INST_DIR}/file_from_infile.py"
-DISTUTILS_OPTS=<<DISTUTILS_OPTS>>
 
 .PHONY : clean install uninstall instance links hacklinks untestinst testinst
 .PHONY : default
@@ -39,12 +36,11 @@
 	@echo
 
 build:
-	"${PYTHON}" "${INST_DIR}/setup.py" ${DISTUTILS_OPTS} build_ext -i
+	"${PYTHON}" "${INST_DIR}/setup.py" <<DISTUTILS_OPTS>> build_ext -i
 
 install: build
-	${INSTALL_COPY} "${SKEL_DIR}" "${TARGET_DIR}"
-	"${PYTHON}" inst/setup.py ${DISTUTILS_OPTS} 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}/bin/mkzopeinstance\'