From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 28 Sep 2011 09:11:51 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58d91b7f376198d4a6553ba36f888fe47c2b6003;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  uninstall: "make uninstall" before "make install" works
---

58d91b7f376198d4a6553ba36f888fe47c2b6003
diff --cc Makefile.in
index 530f8cc9f,a8c32444c..bb1d38e68
--- a/Makefile.in
+++ b/Makefile.in
@@@ -91,14 -91,14 +91,20 @@@ am__nobase_list = $(am__nobase_strip_se
  am__base_list = \
    sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
    sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__uninstall_files_from_dir = { \
+   test -z "$$files" \
+     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+          cd "$$dir" && rm -f $$files; }; \
+   }
  am__installdirs = "$(DESTDIR)$(bindir)"
  SCRIPTS = $(bin_SCRIPTS)
 +AM_V_GEN = $(am__v_GEN_$(V))
 +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 +am__v_GEN_0 = @echo "  GEN     " $@;
 +AM_V_at = $(am__v_at_$(V))
 +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 +am__v_at_0 = @
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
diff --cc tests/Makefile.am
index dd2acdee7,221f08a5c..4c9cf1351
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -1027,9 -850,10 +1027,11 @@@ txinfo30.test 
  txinfo31.test \
  txinfo32.test \
  txinfo33.test \
 +txinfo-unrecognized-extension.test \
  transform.test \
  transform2.test \
+ uninstall-pr9578.test \
+ uninstall-fail.test \
  unused.test \
  upc.test \
  upc2.test \
diff --cc tests/Makefile.in
index d15170589,591cfc6b7..6367a4b4d
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1298,9 -1134,10 +1304,11 @@@ txinfo30.test 
  txinfo31.test \
  txinfo32.test \
  txinfo33.test \
 +txinfo-unrecognized-extension.test \
  transform.test \
  transform2.test \
+ uninstall-pr9578.test \
+ uninstall-fail.test \
  unused.test \
  upc.test \
  upc2.test \