diff options
author | Steven Knight <knight@baldmt.com> | 2001-12-14 02:36:10 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2001-12-14 02:36:10 (GMT) |
commit | 60ca9b913e5ac7d4f8079e521e8cbf2295c196d9 (patch) | |
tree | e7d718182bc2b55362d77cb46b6e2c7c279e18e5 /Construct | |
parent | 445755cb1f9663035326e9d6be812ce53bb5cf11 (diff) | |
download | SCons-60ca9b913e5ac7d4f8079e521e8cbf2295c196d9.zip SCons-60ca9b913e5ac7d4f8079e521e8cbf2295c196d9.tar.gz SCons-60ca9b913e5ac7d4f8079e521e8cbf2295c196d9.tar.bz2 |
Give the debian build its own Command() so we can explicitly remove the debian file before building.
Diffstat (limited to 'Construct')
-rw-r--r-- | Construct | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -393,21 +393,23 @@ for $p ($scons) { push(@install_targets, @targets); }; + @build_src_files = map("$build/$_", @src_files); + if ($dh_builddeb && $fakeroot) { # Debian builds directly into build/dist, so we don't # need to add the .debs to the install_targets. my $deb = "build/dist/${pkg}_$version-1_all.deb"; - push(@build_targets, $deb); - $env->Depends($deb, @{$p->{'debian_deps'}}); - $commands .= qq( + $env->Command($deb, @build_src_files, qq( + rm -f %> fakeroot make -f debian/rules VERSION=%VERSION DH_COMPAT=$DH_COMPAT ENVOKED_BY_CONSTRUCT=1 binary-$pkg - env DH_COMPAT=$DH_COMPAT dh_clean); + env DH_COMPAT=$DH_COMPAT dh_clean)); + $env->Depends($deb, @{$p->{'debian_deps'}}); } # # Now set up creation and installation of the packages. # - $env->Command([@build_targets], map("$build/$_", @src_files), $commands); + $env->Command([@build_targets], @build_src_files, $commands); $env->Install("build/dist", @install_targets); |