[debhelper-devel] [debhelper] 01/02: dh_auto_install: Clean install-dir when buildlabel is reused
Niels Thykier
nthykier at moszumanska.debian.org
Thu Jul 20 21:06:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch easier-multi-builds
in repository debhelper.
commit 0fdcf9609b3a2a5b5ac749b99c38d6e7b67865b5
Author: Niels Thykier <niels at thykier.net>
Date: Thu Jul 20 20:12:08 2017 +0000
dh_auto_install: Clean install-dir when buildlabel is reused
Signed-off-by: Niels Thykier <niels at thykier.net>
---
dh_auto_install | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dh_auto_install b/dh_auto_install
index 095ef71..eee645b 100755
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -95,13 +95,15 @@ if (compat(10)) {
buildsystems_do("install", $destdir);
+my $label_dir = "debian/.debhelper/buildlabels/$dh{BUILDLABEL}";
if (defined($orig_dest_dir)) {
# only set this, if we are not using the default
- my $label_dir = "debian/.debhelper/buildlabels/$dh{BUILDLABEL}";
install_dir($label_dir);
open(my $fd, '>', "${label_dir}/install-dir") or error("open(${label_dir}/install-dir): $!");
print {$fd} "$orig_dest_dir\n";
close($fd) or error("close(${label_dir}/install-dir): $!");
+} else {
+ rm_files("${label_dir}/install-dir");
}
=head1 SEE ALSO
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list