From 097978a9f209662717d5c3c31a44607f049128ea Mon Sep 17 00:00:00 2001
From: Alfredo Beaumont <ziberpunk@ziberghetto.dhis.org>
Date: Wed, 10 Mar 2004 20:50:46 +0000
Subject: [PATCH] Autotools fix: make uninstall now is less intrusive

---
 Makefile.am |  9 +++++++--
 Makefile.in | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index afafd102225..aaa2fedcf0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,5 +7,10 @@ dist_noinst_DATA = @MANUAL_FILES@ copyright changelog @UTIL_FILES@
 nobase_dist_pkgdata_DATA = @DATA_FILES@ @FONT_FILES@ @IMAGE_FILES@ @MUSIC_FILES@ @SOUND_FILES@
 dist_man6_MANS = doc/man/wesnoth.6 doc/man/wesnothd.6 doc/man/wesnoth_editor.6
 
-uninstall-local:
-	rm -r $(prefix)
+uninstall-hook:
+	if test -d $(pkgdatadir) ; then rm -r $(pkgdatadir) ; fi
+	if test -d $(mandir)/man6 ; then echo `rmdir $(mandir)/man6` ; fi
+	if test -d $(mandir); then echo `rmdir $(mandir)` ; fi
+	if test -d $(bindir) ; then echo `rmdir $(bindir)` ; fi
+	if test -d $(datadir) ; then echo `rmdir $(datadir)` ; fi
+	if test -d $(prefix) ; then echo `rmdir $(prefix)` ; fi
diff --git a/Makefile.in b/Makefile.in
index cfa86b76e3b..3e8cf091d9b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -600,8 +600,10 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local uninstall-man \
+uninstall-am: uninstall-info-am uninstall-man \
 	uninstall-nobase_dist_pkgdataDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
 uninstall-info: uninstall-info-recursive
 
@@ -622,13 +624,18 @@ uninstall-man: uninstall-man6
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
 	ps-recursive tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-info-recursive uninstall-local \
-	uninstall-man uninstall-man6 uninstall-nobase_dist_pkgdataDATA \
+	uninstall-info-am uninstall-info-recursive uninstall-man \
+	uninstall-man6 uninstall-nobase_dist_pkgdataDATA \
 	uninstall-recursive
 
 
-uninstall-local:
-	rm -r $(prefix)
+uninstall-hook:
+	if test -d $(pkgdatadir) ; then rm -r $(pkgdatadir) ; fi
+	if test -d $(mandir)/man6 ; then echo `rmdir $(mandir)/man6` ; fi
+	if test -d $(mandir); then echo `rmdir $(mandir)` ; fi
+	if test -d $(bindir) ; then echo `rmdir $(bindir)` ; fi
+	if test -d $(datadir) ; then echo `rmdir $(datadir)` ; fi
+	if test -d $(prefix) ; then echo `rmdir $(prefix)` ; fi
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: