[Zope-Checkins] CVS: Zope - .cvsignore:1.3.52.1 Makefile.in:1.1.2.2 configure:1.1.2.3 setup.py:1.3.4.2

[Matt Behrens]

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

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	.cvsignore Makefile.in configure setup.py 
Log Message:
Further progress on this branch.

'zope create', to create an instance, works now, although the
instance is currently rather bare :-)



=== Zope/.cvsignore 1.3 => 1.3.52.1 ===
 inituser
 ZODBTests.fs*
+Makefile


=== Zope/Makefile.in 1.1.2.1 => 1.1.2.2 ===
 #
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 
 PREFIX=@PREFIX@
@@ -32,13 +32,20 @@
 build:
 	${PYTHON} setup.py build
 
-install:	build
+install:	install-zope install-control-util register-installation
+
+install-zope:
 	${PYTHON} setup.py install \
 		--home=${DESTDIR}${SOFTWARE_DIR}/${SOFTWARE_NAME} \
 		--install-platlib=${DESTDIR}${SOFTWARE_DIR}/${SOFTWARE_NAME} \
 		--install-purelib=${DESTDIR}${SOFTWARE_DIR}/${SOFTWARE_NAME}
+
+install-control-util:
 	install -d -m 755 ${DESTDIR}${BINDIR}
 	install -C -m 755 ZopeControl/zope ${DESTDIR}${BINDIR}
+
+register-installation:
+	install -d -m 755 ${DESTDIR}${CONFIG_DIR}
 	${PYTHON} inst/register_software.py ${CONFIG_DIR} ${SOFTWARE_NAME} \
 		${SOFTWARE_DIR}/${SOFTWARE_NAME} ${REGISTER_DEFAULT}
 
@@ -47,5 +54,5 @@
 	rm -rf build lib/python/build
 
 distclean:	clean
-	rm -f @SUBST_FILES@
+	rm -f `./configure --subst-files`
 


=== Zope/configure 1.1.2.2 => 1.1.2.3 ===
 #
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 
 # Supported versions of Python for this version of Zope.
 SUPPORTED_VERSION=2.1
 SUPPORTED_PATCHLEVEL=2.1.3
 
-# Search for these Python binaries by default.  Matches later in the list
+# Search for these Python binaries by default.	Matches later in the list
 # win over ones earlier in the list.
 SEARCH_PYTHONS="python python$SUPPORTED_PATCHLEVEL python$SUPPORTED_VERSION"
 
@@ -44,7 +44,7 @@
 _which()
 {
     if which $1 2>&1 > /dev/null; then
-        _result=`which $1 2>&1`
+	_result=`which $1 2>&1`
 	if test -f $_result; then
 	    echo $_result
 	    return 0
@@ -55,7 +55,7 @@
 
 echo Zope source distribution configuration utility
 echo Copyright \(c\) 2002 Zope Corporation and Contributors. All Rights
-echo Reserved.  This software is subject to the provisions of the Zope
+echo Reserved.	This software is subject to the provisions of the Zope
 echo Public License, Version 2.0 \(ZPL\).  See LICENSE.txt.
 echo
 
@@ -142,7 +142,7 @@
 if test x$OVERRIDE_PYTHON = x; then
     echo Searching for Python binary \(version $SUPPORTED_VERSION, minimum patchlevel $SUPPORTED_PATCHLEVEL\)...
     for search_python in $SEARCH_PYTHONS; do
-    	if _which $search_python >/dev/null 2>&1; then
+	if _which $search_python >/dev/null 2>&1; then
 	    python=`_which $search_python`
 	    echo $python is \\\c
 	    if $python inst/acceptable_version.py $SUPPORTED_VERSION $SUPPORTED_PATCHLEVEL; then
@@ -158,9 +158,9 @@
     fi
 else
     if _which $OVERRIDE_PYTHON >/dev/null 2>&1; then
-    	PYTHON=`_which $OVERRIDE_PYTHON`
+	PYTHON=`_which $OVERRIDE_PYTHON`
 	echo $PYTHON is \\\c
-    	if $PYTHON inst/acceptable_version.py $SUPPORTED_VERSION $SUPPORTED_PATCHLEVEL; then
+	if $PYTHON inst/acceptable_version.py $SUPPORTED_VERSION $SUPPORTED_PATCHLEVEL; then
 	    echo This is an acceptable version of Python for this version of Zope.
 	else
 	    echo WARNING: This is not a supported version of Python.  Supported for
@@ -188,7 +188,7 @@
 fi
 echo Installing this version of Zope with the software name $SOFTWARE_NAME.
 if test x$REGISTER_DEFAULT = x1; then
-    echo This version of Zope will be registered as your system\'s default Zope 
+    echo This version of Zope will be registered as your system\'s default Zope
     echo version.
 fi
 echo


=== Zope/setup.py 1.3.4.1 => 1.3.4.2 ===
 )
 
+# z2.py
+setup(
+    name='z2.py',
+    author=AUTHOR,
+
+    py_modules=['z2']
+)
+