Give mkzopeinstance and mkzeoinstance a .py extension.

Don't put zconfig script into bindir.

doc/INSTALL.txt

@@ -72,15 +72,15 @@ Creating a Zope Instance Home
   Once you've performed the install step, to begin actually using
   Zope, you will need to create an "instance home", which is a
   directory that contains configuration and data for a Zope server
-  process.  The instance home is created using the 'mkzopeinstance'
+  process.  The instance home is created using the 'mkzopeinstance.py'
   script::
 
-    /where/to/install/zope/bin/mkzopeinstance /location/of/zope/instance
+    /where/to/install/zope/bin/mkzopeinstance.py /location/of/zope/instance
 
   You will be asked to provide a user name and password for an
-  administrator's account during the 'mkzopeinstance'.  Command-line
+  administrator's account during 'mkzopeinstance'.  Command-line
   options to 'mkzopeinstance' are available, and can be investigated
-  by running 'mkzopeinstance --help'.
+  by running 'mkzopeinstance.py --help'.
 
 Starting Zope
 

inst/Makefile.in

@@ -57,7 +57,7 @@ install: build
 	   --home="${PREFIX}" ${BUILD_FLAGS} ${INSTALL_FLAGS}
 	@echo
 	@echo Zope binaries installed successfully.
-	@echo Now run \'${PREFIX}/bin/mkzopeinstance\'
+	@echo Now run \'${PREFIX}/bin/mkzopeinstance.py\'
 
 # uninstall:   Uninstall a software home.
 uninstall:
@@ -81,7 +81,7 @@ inplace: install
 # instance:    Do an inplace build and create an instance home in the resulting
 #              software home.
 instance: inplace
-	${PYTHON} "${BASE_DIR}/bin/mkzopeinstance" ${MKZ_FLAGS} "${BASE_DIR}" 
+	${PYTHON} "${BASE_DIR}/bin/mkzopeinstance.py" ${MKZ_FLAGS} "${BASE_DIR}" 
 
 # uninstance:  Remove the instance files made by make instance (w/ prejudice)
 uninstance:

inst/Makefile.win.in

@@ -55,7 +55,7 @@ install: build
            --prefix="$(PREFIX)" $(BUILD_FLAGS) $(INSTALL_FLAGS)
 	@ echo.
 	@ echo Zope binaries installed successfully.
-	@ echo Now run '$(PYTHON) $(PREFIX)\bin\mkzopeinstance'
+	@ echo Now run '$(PYTHON) $(PREFIX)\bin\mkzopeinstance.py'
 
 # uninstall:   Uninstall a software home.
 uninstall:

setup.py

@@ -671,8 +671,8 @@ setup(
         ['ZConfig/tests/input', ['ZConfig/tests/input/*']],
         ['ZConfig/tests/library/thing', ['ZConfig/tests/library/thing/*']],
         ['ZConfig/tests/library/widget', ['ZConfig/tests/library/widget/*']],
+        ['ZConfig/scripts', ['ZConfig/scripts/zconfig']],
         ],
-    scripts=["ZConfig/scripts/zconfig"],
     )
 
 # Other top-level packages (XXX should these be broken out at all?)
@@ -1092,7 +1092,7 @@ distutils.core.setup(
     author=AUTHOR,
 
     data_files=installed_data_files,
-    scripts=["utilities/mkzeoinstance", "utilities/mkzopeinstance"],
+    scripts=["utilities/mkzeoinstance.py", "utilities/mkzopeinstance.py"],
     distclass=ZopeDistribution,
     )