BUG: setuptools does not run install_clib automatically -- run it manually in install_data, if setuptools is present (fix #1194)

pv · pv · commit 3122ee546fc0 · 2009-11-12T20:55:40.000Z
diff --git a/numpy/distutils/command/install.py b/numpy/distutils/command/install.py
@@ -10,8 +10,11 @@
 
 class install(old_install):
 
-    # Always run install_clib - the command is cheap, so no need to bypass it
-    sub_commands = old_install.sub_commands + [('install_clib', lambda x: True)]
+    # Always run install_clib - the command is cheap, so no need to bypass it;
+    # but it's not run by setuptools -- so it's run again in install_data
+    sub_commands = old_install.sub_commands + [
+        ('install_clib', lambda x: True)
+    ]
 
     def finalize_options (self):
         old_install.finalize_options(self)
diff --git a/numpy/distutils/command/install_data.py b/numpy/distutils/command/install_data.py
@@ -1,10 +1,21 @@
+import sys
+have_setuptools = ('setuptools' in sys.modules)
+
 from distutils.command.install_data import install_data as old_install_data
 
 #data installer with improved intelligence over distutils
 #data files are copied into the project directory instead
 #of willy-nilly
 class install_data (old_install_data):
 
+    def run(self):
+        old_install_data.run(self)
+
+        if have_setuptools:
+            # Run install_clib again, since setuptools does not run sub-commands
+            # of install automatically
+            self.run_command('install_clib')
+
     def finalize_options (self):
         self.set_undefined_options('install',
                                    ('install_lib', 'install_dir'),
