From 00a35871d1af7aee6c329b6341e79d592e234272 Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Thu, 31 May 2007 04:57:01 +0000
Subject: [PATCH] Fix some problems with data-files not being added in
 top-level and extra version information added to the name of development
 distributions.

---
 numpy/distutils/misc_util.py |  2 +-
 setup.py                     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index c42520d0e286..b661d3e443f1 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -1041,7 +1041,7 @@ def paths(self,*paths,**kws):
         """
         include_non_existing = kws.get('include_non_existing',True)
         return gpaths(paths,
-                      local_path = self.local_path,
+                      local_path = self.path_in_package,
                       include_non_existing=include_non_existing)
 
     def _fix_paths_dict(self,kw):
diff --git a/setup.py b/setup.py
index b69ab48da182..abf3b4ebd49b 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,8 @@
 records without sacrificing too much speed for small multi-dimensional
 arrays.  NumPy is built on the Numeric code base and adds features
 introduced by numarray as well as an extended C-API and the ability to
-create arrays of arbitrary type.
+create arrays of arbitrary type which also makes NumPy suitable for
+interfacing with general-purpose data-base applications.
 
 There are also basic facilities for discrete fourier transform,
 basic linear algebra and random number generation.
@@ -47,11 +48,12 @@ def configuration(parent_package='',top_path=None):
     
     config.add_subpackage('numpy')
         
-    config.add_data_files(('numpy',['*.txt','COMPATIBILITY',
-                                    'scipy_compatibility']))
+    config.add_data_files(('numpy','*.txt'), ('.','COMPATIBILITY'),
+                          ('.','scipy_compatibility'), 
+                          ('.','site.cfg.example'))
 
     config.get_version('numpy/version.py') # sets config.version
-    
+
     return config
 
 def setup_package():
@@ -64,10 +66,8 @@ def setup_package():
     sys.path.insert(0,local_path)
 
     try:
-        from numpy.version import version
         setup(
             name = 'numpy',
-            version = version, # will be overwritten by configuration version
             maintainer = "NumPy Developers",
             maintainer_email = "numpy-discussion@lists.sourceforge.net",
             description = DOCLINES[0],