summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-26 12:20:44 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-26 13:32:45 +0100
commitb307adcedaf7ae391d106f397ff27c560fbc7d38 (patch)
treefb3b0743afe566f38467d9cfb3cdff8fddbe43de
parent62c6ca3964bfa05fbfc50ee70df0e7ad53eba282 (diff)
dgit: build: Squash $buildproductsdir
Things malfunction, because some things end up in .. and some in bpd. Overriding this at least makes `dgit build' produce correct results, albeit in the wrong place. Closes: #906786. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit5
1 files changed, 3 insertions, 2 deletions
diff --git a/dgit b/dgit
index 3962134..d38d914 100755
--- a/dgit
+++ b/dgit
@@ -6324,9 +6324,10 @@ sub postbuild_mergechanges_vanilla ($) {
sub cmd_build {
build_prep_early();
$buildproductsdir eq '..' or print STDERR <<END;
-$us: warning: build-products-dir set, but not supported by dgit build
-$us: warning: things may go wrong or files may go to the wrong place
+$us: warning: build-products-dir set, but not supported by dpkg-buildpackage
+$us: warning: build-products-dir will be ignored; files will go to ..
END
+ $buildproductsdir = '..';
my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
my $wantsrc = massage_dbp_args \@dbp;
build_prep($wantsrc);