[Zope-Checkins] CVS: Zope/inst - Makefile.in:1.5 Makefile.win.in:1.3 setup.py:NONE

[Fred L. Drake, Jr.]

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

Modified Files:
	Makefile.in Makefile.win.in 
Removed Files:
	setup.py 
Log Message:
Move the distutils setup.py script to the usual location.

=== Zope/inst/Makefile.in 1.4 => 1.5 ===
--- Zope/inst/Makefile.in:1.4	Mon Mar 24 16:18:06 2003
+++ Zope/inst/Makefile.in	Wed Mar 26 13:23:18 2003
@@ -39,25 +39,25 @@
 	@echo
 
 build:
-	${PYTHON} "${BASE_DIR}/inst/setup.py" \
+	${PYTHON} "${BASE_DIR}/setup.py" \
            ${DISTUTILS_OPTS} build ${BUILD_FLAGS}
 
 install: build
-	${PYTHON} "${BASE_DIR}/inst/setup.py" ${DISTUTILS_OPTS} install \
+	${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} install \
 	   --home="${PREFIX}" ${BUILD_FLAGS} ${INSTALL_FLAGS}
 	@echo
 	@echo Zope binaries installed successfully.
 	@echo Now run \'${PREFIX}/bin/mkzopeinstance\'
 
 instance:
-	${PYTHON} "${BASE_DIR}/inst/setup.py" ${DISTUTILS_OPTS} build_ext -i
+	${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} build_ext -i
 	${PYTHON} "${BASE_DIR}/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} "${BASE_DIR}/inst/setup.py" ${DISTUTILS_OPTS} build_ext -i
+	${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} build_ext -i
 	${PYTHON} "${BASE_DIR}/bin/mkzopeinstance" --user=admin:admin .
 
 # remove the instance files made with testinst (w/ prejudice)


=== Zope/inst/Makefile.win.in 1.2 => 1.3 ===
--- Zope/inst/Makefile.win.in:1.2	Sat Mar 22 12:02:12 2003
+++ Zope/inst/Makefile.win.in	Wed Mar 26 13:23:18 2003
@@ -36,7 +36,7 @@
 default: build
 
 build:
-	$(PYTHON) "$(BASE_DIR)\inst\setup.py" \
+	$(PYTHON) "$(BASE_DIR)\setup.py" \
             $(DISTUTILS_OPTS) build $(BUILD_FLAGS)
 	@ echo.
 	@ echo Zope built.  Next, do 'nmake install' (or 'nmake instance'
@@ -44,21 +44,21 @@
 	@ echo.
 
 install: build
-	$(PYTHON) "$(BASE_DIR)\inst\setup.py" $(DISTUTILS_OPTS) install \
+	$(PYTHON) "$(BASE_DIR)\setup.py" $(DISTUTILS_OPTS) install \
            --prefix="$(PREFIX)" $(BUILD_FLAGS) $(INSTALL_FLAGS)
 	@ echo.
 	@ echo Zope binaries installed successfully.
 	@ echo Now run '$(PYTHON) $(PREFIX)\bin\mkzopeinstance'
 
 instance: build
-	$(PYTHON) "$(BASE_DIR)\inst\setup.py" $(DISTUTILS_OPTS) build_ext -i
+	$(PYTHON) "$(BASE_DIR)\setup.py" $(DISTUTILS_OPTS) build_ext -i
 	$(PYTHON) "$(BASE_DIR)\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) "$(BASE_DIR)\inst\setup.py" $(DISTUTILS_OPTS) build_ext -i
+	$(PYTHON) "$(BASE_DIR)\setup.py" $(DISTUTILS_OPTS) build_ext -i
 	$(PYTHON) "$(BASE_DIR)\bin\mkzopeinstance" --user=admin:admin .
 
 # remove the instance files made with testinst (w/ prejudice)

=== Removed File Zope/inst/setup.py ===