From 877defd1bb53ee21ec49df6a2eaf53c5920797db Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 8 Mar 2002 13:33:04 -0500 Subject: [svn-r5052] Purpose: Bug Fix Description: The Fortran module files weren't being uninstalled. Solution: Added them to the 'uninstall:' list... Platforms tested: Linux --- fortran/config/conclude.in | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/fortran/config/conclude.in b/fortran/config/conclude.in index 3b1bbce..9db274b 100644 --- a/fortran/config/conclude.in +++ b/fortran/config/conclude.in @@ -74,8 +74,8 @@ install: $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir) ((cp *.$(F9XMODEXT) $(libdir)/. && chmod 644 $(libdir)/*.$(F9XMODEXT)) || exit 1); \ fi; \ fi - @if test -f libhdf5.settings; then \ - (set -x; $(INSTALL_DATA) libhdf5.settings $(libdir)/. || exit 1); \ + @if test -f libhdf5.fortran.settings; then \ + (set -x; $(INSTALL_DATA) libhdf5.fortran.settings $(libdir)/. || exit 1); \ fi @for f in X $(PUB_HDR); do \ if test $$f != X; then \ @@ -107,16 +107,21 @@ uninstall-examples: ## Removes those things that `make install' (would have) installed. uninstall: - @for f in libhdf5.settings $(LIB); do \ - $(LT_UNINSTALL) $(libdir)/$$f; \ + @for f in libhdf5.fortran.settings $(LIB); do \ + $(LT_UNINSTALL) $(libdir)/$$f; \ done @if test -n "$(PUB_HDR)"; then \ - set -x; cd $(includedir) && $(RM) $(PUB_HDR); \ + set -x; cd $(includedir) && $(RM) $(PUB_HDR); \ + fi + @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ + if test -f "$(libdir)/hdf5.$(F9XMODEXT)" -o -f "$(libdir)/HDF5.$(F9XMODEXT)"; then \ + set -x; $(RM) $(libdir)/*.$(F9XMODEXT); \ + fi; \ fi @for f in X $(PUB_PROGS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(bindir)/$$f; \ - fi; \ + if test $$f != X; then \ + $(LT_UNINSTALL) $(bindir)/$$f; \ + fi; \ done ## Removes temporary files without removing the final target files. That is, -- cgit v0.12