Move the distutils setup.py script to the usual location.

inst/Makefile.in

@@ -39,25 +39,25 @@ default: build
 	@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)

inst/Makefile.win.in

@@ -36,7 +36,7 @@ COPY=copy
 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 @@ build:
 	@ 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)

inst/setup.py → setup.py

@@ -173,7 +173,7 @@ class ZopeDistribution(distutils.core.Distribution):
         self.cmdclass["install_data"] = ZopeInstallData
         
 # presumes this script lives in the 'inst' subdirectory of the base dir
-BASE_DIR=os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0])))
+BASE_DIR=os.path.dirname(os.path.abspath(sys.argv[0]))
 
 AUTHOR = 'Zope Corporation and Contributors'
 EXTENSIONCLASS_ROOT = os.path.join(BASE_DIR, 'lib', 'Components',