Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 28 Sep 2011 09:11:51 +0000 (11:11 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 28 Sep 2011 09:11:51 +0000 (11:11 +0200)
* maint:
  uninstall: "make uninstall" before "make install" works

12 files changed:
1  2 
ChangeLog
Makefile.in
NEWS
THANKS
doc/Makefile.in
lib/Automake/Makefile.in
lib/Automake/tests/Makefile.in
lib/Makefile.in
lib/am/Makefile.in
m4/Makefile.in
tests/Makefile.am
tests/Makefile.in

diff --cc ChangeLog
Simple merge
diff --cc 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 NEWS
Simple merge
diff --cc THANKS
Simple merge
diff --cc doc/Makefile.in
Simple merge
Simple merge
Simple merge
diff --cc lib/Makefile.in
Simple merge
Simple merge
diff --cc m4/Makefile.in
Simple merge
@@@ -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 \
@@@ -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 \