Fix a build reentrancy problem introduced by our RPM build.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@151 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/Construct b/Construct
index 4a8078212f6d0f29d231ef9aa3ef1f6bb8342510..049ce06fc53977d2a1f3b923c12710e58431f7c1 100644 (file)
--- a/Construct
+++ b/Construct
@@ -347,8 +347,6 @@ for $p ($scons) {
 
     push(@src_deps, $archive);
 
-    my @setup_args = ('bdist', 'sdist');
-
     my @build_targets = (
        "$build/dist/$pkg-$version.$platform.$archsuffix",
        $archive,
@@ -359,7 +357,9 @@ for $p ($scons) {
     # We can get away with calling setup.py using a directory path
     # like this because we put a preamble in it that will chdir()
     # to the directory in which setup.py exists.
-    my $commands = qq(python $build/setup.py @setup_args
+    my @bdist_dirs = ("$build/build/lib", "$build/build/scripts");
+    my $commands = qq(rm -rf @bdist_dirs && python $build/setup.py bdist
+                     python $build/setup.py sdist
                       python $build/setup.py bdist_wininst);
 
     if ($rpm) {