[Zope-Checkins] CVS: Zope - configure:1.13.2.1 setup.py:1.31.2.2

[Chris McDonough]

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

Modified Files:
      Tag: Zope-2_7-branch
	configure setup.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/configure 1.13 => 1.13.2.1 ===
--- Zope/configure:1.13	Tue Jun 24 18:35:34 2003
+++ Zope/configure	Mon Jul 21 12:34:49 2003
@@ -152,7 +152,8 @@
 }
 
 out() {
-    if [ -z $QUIET ]; then
+    
+   if [ -z "$QUIET" ]; then
       echo $1
     fi
 }


=== Zope/setup.py 1.31.2.1 => 1.31.2.2 ===
--- Zope/setup.py:1.31.2.1	Mon Jul  7 11:28:32 2003
+++ Zope/setup.py	Mon Jul 21 12:34:50 2003
@@ -32,12 +32,6 @@
         --home=/usr/local/lib/zope \
         --install-platlib=/usr/local/lib/zope \
         --install-purelib=/usr/local/lib/zope
-
-    Note that with this method, all packages and scripts (including
-    ZServer and z2.py) go in the same directory as Zope modules, which
-    are distributed in lib/python.  You will need to set both ZOPE_HOME
-    and SOFTWARE_HOME to point to your destination directory in order
-    for Zope to work in this configuration.
 """
 
 import glob
@@ -292,6 +286,15 @@
                 ['DateTime/tests', ['DateTime/tests/julian_testdata.txt.gz']]],
     )
 
+# DBTab
+setup(
+    name='DBTab',
+    author=AUTHOR,
+
+    packages=['DBTab'],
+    data_files=[['DBTab', ['DBTab/CHANGES.txt']]],
+    )
+
 # DocumentTemplate
 setup(
     name='DocumentTemplate',
@@ -917,7 +920,9 @@
     author=AUTHOR,
 
     packages=['Products.TemporaryFolder', 'Products.TemporaryFolder.tests'],
-    data_files=[['Products/TemporaryFolder/dtml',
+    data_files=[['Products/TemporaryFolder',
+                    ['Products/TemporaryFolder/*.xml']],
+                ['Products/TemporaryFolder/dtml',
                     ['Products/TemporaryFolder/dtml/*']],
                 ['Products/TemporaryFolder/help',
                     ['Products/TemporaryFolder/help/*']],
@@ -987,6 +992,17 @@
                     ['Products/ZGadflyDA/gadfly/COPYRIGHT',
                      'Products/ZGadflyDA/gadfly/sql.mar',
                      'Products/ZGadflyDA/gadfly/*.html']]],
+    )
+
+# ZODBMountPoint product
+setup(
+    name='ZODBMountPoint',
+    author=AUTHOR,
+
+    packages=['Products.ZODBMountPoint', 'Products.ZODBMountPoint.tests'],
+    data_files=[['Products/ZODBMountPoint/www',
+                 ['Products/ZODBMountPoint/www/*']],
+                ],
     )
 
 # ZReST product