diff options
| author | Pearu Peterson <pearu.peterson@gmail.com> | 2006-01-26 22:17:44 +0000 |
|---|---|---|
| committer | Pearu Peterson <pearu.peterson@gmail.com> | 2006-01-26 22:17:44 +0000 |
| commit | 606c857c8e5c9ee844a58dd5919d14a6eaff191e (patch) | |
| tree | d184e41e4e540426052a60d31a8dc4e11d1da167 | |
| parent | e59bb826219298274ca8c2a87f94e83b52a6175c (diff) | |
| download | numpy-606c857c8e5c9ee844a58dd5919d14a6eaff191e.tar.gz | |
Prefer xxx/setup.py file over xxx/setup_xxx.py when both exist.
| -rw-r--r-- | numpy/distutils/misc_util.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 54a154051..d17a31c6d 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -381,9 +381,10 @@ class Configuration: subpackage_path = os.path.join(*([subpackage_path]+l[:-1])) subpackage_path = self._fix_paths([subpackage_path])[0] - setup_py = os.path.join(subpackage_path,'setup_%s.py' % (subpackage_name)) + setup_py = os.path.join(subpackage_path,'setup.py') if not os.path.isfile(setup_py): - setup_py = os.path.join(subpackage_path,'setup.py') + setup_py = os.path.join(subpackage_path,'setup_%s.py' % (subpackage_name)) + if not os.path.isfile(setup_py): print 'Assuming default configuration '\ '(%s/{setup_%s,setup}.py was not found)' \ |