From 2c49a718d7e3332f4a7cbbf612956806b27a6375 Mon Sep 17 00:00:00 2001
From: Bill Wendling <wendling@ncsa.uiuc.edu>
Date: Thu, 21 Feb 2002 16:10:29 -0500
Subject: [svn-r4999] Purpose: 	Bug Fix Description: 	``make uninstall-doc''
 wasn't working properly. Some files would be 	left behind in the installed
 source tree. The fix I put in was too 	heavy-handed as it wiped out the
 entire doc tree that was installed 	and would remove any other files which
 were installed there. Solution: 	Executed the ``make
 uninstall-examples'' command if uninstalling the 	docs. Fixed how the
 java Tutorial examples were being removed (they 	weren't). Essentially
 used the PUB_SUBDOCS macro to help remove them. Platforms tested: 	Linux

---
 Makefile.in        | 7 ++++++-
 config/conclude.in | 3 +++
 doc/Makefile.in    | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c275988..0325d5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 ## Top-level HDF5 Makefile(.in)
 ##
-## Copyright (C) 1997, 1998, 1999, 2000, 2001
+## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
 ##    National Center for Supercomputing Applications
 ##    All rights reserved.
 ##
@@ -76,6 +76,10 @@ install-all:
 	@$(MAKE) install-doc
 	@$(LT) --mode=finish $(libdir)
 
+uninstall-all:
+	@$(MAKE) uninstall
+	@$(MAKE) uninstall-doc
+
 install:
 	@@SETX@; for d in $(SUBDIRS); do				      \
 	   (cd $$d && $(MAKE) $@) || exit 1;				      \
@@ -104,6 +108,7 @@ install-doc:
 	(cd doc && $(MAKE) $@) || exit 1;
 
 uninstall-doc:
+	@$(MAKE) uninstall-examples
 	(cd doc && $(MAKE) $@) || exit 1;
 
 ## Number format detection
diff --git a/config/conclude.in b/config/conclude.in
index 07a9040..7571bd8 100644
--- a/config/conclude.in
+++ b/config/conclude.in
@@ -211,6 +211,9 @@ uninstall-doc:
 	@if test -n "$(PUB_DOCS)"; then 				      \
 	   set -x; cd $(DOCDIR) && $(RM) $(PUB_DOCS);			      \
 	fi
+	@if test -n "$(PUB_SUBDOCS)"; then						\
+		set -x; cd $(DOCDIR) && $(RM) $(PUB_SUBDOCS);			    \
+	fi
 
 ## Removes temporary files without removing the final target files.  That is,
 ## remove things like object files but not libraries or executables.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a5fea82..8a56e2e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -37,7 +37,9 @@ install-doc:
 	done
 
 uninstall-doc:
-	-$(RM) -r $(DOCDIR)/hdf5
+	@@SETX@; for d in $(SUBDIRS); do                                      \
+		(cd $$d && $(MAKE) $@) || exit 1;                                  \
+	done
 
 .PHONY: all lib progs test _test install uninstall dep depend clean           \
 	mostlyclean distclean maintainer-clean
-- 
cgit v0.12