Merge pull request #1705 from floppym/install-shebang2

setup.py: install scripts from build_dir 

2 files changed, 7 insertions, 4 deletions

diff --git a/authors.txt b/authors.txt
index 1cfcad7..8a02848 100644
--- a/authors.txt
+++ b/authors.txt
@@ -84,3 +84,4 @@ Michael Olbrich
 Ernestas Kulik
 Thomas Hindoe Paaboel Andersen
 Paolo Borelli
+Mike Gilbert
diff --git a/setup.py b/setup.py
index 300ddf1..8996772 100644
--- a/setup.py
+++ b/setup.py
@@ -16,8 +16,6 @@
 
 import os
 import sys
-from distutils.dir_util import mkpath
-from distutils.file_util import copy_file
 
 from mesonbuild.coredata import version
 
@@ -41,16 +39,20 @@ class install_scripts(orig):
             super().run()
             return
 
+        if not self.skip_build:
+            self.run_command('build_scripts')
         self.outfiles = []
         if not self.dry_run:
-            mkpath(self.install_dir)
+            self.mkpath(self.install_dir)
 
         # We want the files to be installed without a suffix on Unix
         for infile in self.get_inputs():
+            infile = os.path.basename(infile)
+            in_built = os.path.join(self.build_dir, infile)
             in_stripped = infile[:-3] if infile.endswith('.py') else infile
             outfile = os.path.join(self.install_dir, in_stripped)
             # NOTE: Mode is preserved by default
-            copy_file(infile, outfile, dry_run=self.dry_run)
+            self.copy_file(in_built, outfile)
             self.outfiles.append(outfile)
 
 setup(name='meson',