From 527019f55595327aa9de596e87238035574558ce Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sun, 7 Apr 2013 23:53:15 -0700 Subject: [PATCH] debian/implicit: skip unnecessary removal of $pkg.deb* The rules to build foo.deb and foo.udeb remove various files named after the implicit prerequisites after following rules to build those same files. Presumably this is intended to prevent real files that happen to be around from preventing the rules from being run, but the removal takes place after dependencies have been satisfied so it has no useful effect. Eliminate the removal for clarity. In the future these could be made prerequisites of the .PHONY pseudotarget using an appropriate $(wildcard) expression to actually ensure poorly named files could not interfere with GNU make's dependency management. Luckily it hasn't been a problem in practice. This patch doesn't do anything in that direction. Signed-off-by: Jonathan Nieder --- debian/changelog | 1 + debian/implicit | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0110974a9b..6ded09f449 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ git (1:1.8.2-1.1) experimental; urgency=low * debian/rules: do not create ./changelog symlink (avoiding a race). * debian/rules: override implicit git-core.deb-docs target, since git-core does not have its own doc/ directory. + * debian/implicit: do not remove files named after implicit targets. -- Jonathan Nieder Sun, 07 Apr 2013 17:15:39 -0700 diff --git a/debian/implicit b/debian/implicit index 46b2814132..8437344def 100644 --- a/debian/implicit +++ b/debian/implicit @@ -6,14 +6,10 @@ deb-checkuid: @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' %.deb: %.deb-share %.deb-DEBIAN - @rm -f $*.deb $*.deb-checkdir $*.deb-docs $*.deb-docs-base \ - $*.deb-docs-docs $*.deb-docs-examples \ - $*.deb-lintian $*.deb-doc-base $*.deb-DEBIAN \ - $*.deb-DEBIAN-dir $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + : $*.deb ok %.udeb: %.deb-DEBIAN - @rm -f $*.deb $*.deb-checkdir $*.deb-DEBIAN $*.deb-DEBIAN-dir \ - $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + : $*.udeb ok %.deb-checkdir: %.install @test -d debian/$* || sh -cx '! : directory debian/$* missing' -- 2.11.4.GIT