From c029a184d6a1a96c6de234835fff97d4e946b19c Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 25 Jun 2014 19:44:28 +0200 Subject: [PATCH] speedo: "make clean-gnupg" may not remove the source. * build-aux/speedo.mk (clean-$(1)): Take care of gnupg. -- I learned it the hard way and lost a bunch of stashed changes. --- build-aux/speedo.mk | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index 1ef160003..4f0751fca 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -731,11 +731,15 @@ $(stampdir)/stamp-w64-final-$(1): $(stampdir)/stamp-w64-$(1)-03-install .PHONY : clean-$(1) clean-$(1): @echo "speedo: uninstalling $(1)" - @($(call SETVARS,$(1)); \ - (cd "$$$${pkgbdir}" 2>/dev/null && \ - $(MAKE) --no-print-directory \ - $$$${pkgmkargs_inst} uninstall V=0 ) || true;\ - rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}" || true) + @($(call SETVARS,$(1)); \ + (cd "$$$${pkgbdir}" 2>/dev/null && \ + $(MAKE) --no-print-directory \ + $$$${pkgmkargs_inst} uninstall V=0 ) || true ;\ + if [ "$(1)" = "gnupg" ]; then \ + rm -fR "$$$${pkgbdir}" || true ;\ + else \ + rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}" || true;\ + fi) -rm -f $(stampdir)/stamp-final-$(1) $(stampdir)/stamp-$(1)-*