[Zope-Checkins] CVS: Zope/inst - setup.py:1.1.4.2

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: new-install-branch
	setup.py 
Log Message:
- clean up one case of "path math": use the local conventions for
  testing for files/directories, and POSIX conventions when providing
  information to distutils
- normalize whitespace


=== Zope/inst/setup.py 1.1.4.1 => 1.1.4.2 ===
--- Zope/inst/setup.py:1.1.4.1	Thu Feb 13 18:13:48 2003
+++ Zope/inst/setup.py	Fri Feb 14 12:27:35 2003
@@ -562,7 +562,7 @@
 
     packages=['Zope', 'Zope.App', 'Zope.Startup', 'Zope.Startup.misc',
               'Zope.Startup.nt'],
-    
+
     data_files=[ ['Zope/Startup', ['Zope/Startup/*.xml']] ],
 )
 
@@ -591,7 +591,7 @@
     author=AUTHOR,
 
     packages=['zLOG', 'zLOG.tests'],
-    data_files=[ ['zLOG', ['zLOG/*.xml']] ],
+    data_files=[['zLOG', ['zLOG/*.xml']]],
 )
 
 # zdaemon
@@ -1055,13 +1055,12 @@
         names.remove("CVS")
     L = []
     for name in names:
-        fn = os.path.join(dirname, name)
-        if os.path.isfile(fn):
-            L.append(fn)
-    skel.append((os.path.join("..", "..", dirname), L))
+        if os.path.isfile(os.path.join(dirname, name)):
+            L.append("%s/%s" % (dirname, name))
+    skel.append(("../../" + dirname, L))
 
 installed_data_files = [
-    [os.path.join("..", "..", "import"), ['import/*.zexp']],
+    ["../../import", ['import/*.zexp']],
     ]
 os.path.walk("skel", skel_visit, installed_data_files)