Fix 'uninstall' target

This adds some missing code to the 'uninstall' targets in gdb and
gdbserver.  It also changes gdb's uninstall target so that it no
longer tries to remove any man page -- this is already done (and more
correctly) by doc/Makefile.in.

I tested this with 'make install' followed by 'make uninstall', then
examining the install tree for regular files.  Only the 'dir' file
remains, but this appears to just be how 'install-info' is intended to
work.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index ec5d332c145b75439187a31f0d638e9ba174c193..b22394a65b41bcf788a367d6cc47f425da59e9ee 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1819,8 +1819,8 @@ uninstall: force $(CONFIG_UNINSTALL)
                else \
                  true ; \
                fi ; \
-               rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
-                     $(DESTDIR)$(man1dir)/$$transformed_name.1
+               rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT)
+               rm -f $(DESTDIR)$(includedir)/gdb/jit-reader.h
        if test "x$(HAVE_NATIVE_GCORE_TARGET)$(HAVE_NATIVE_GCORE_HOST)" != x; \
        then \
          transformed_name=`t='$(program_transform_name)'; \
@@ -1832,6 +1832,14 @@ uninstall: force $(CONFIG_UNINSTALL)
                  fi ; \
                  rm -f $(DESTDIR)$(bindir)/$$transformed_name; \
        fi
+       transformed_name=`t='$(program_transform_name)'; \
+                         echo gdb-add-index | sed -e "$$t"` ; \
+       if test "x$$transformed_name" = x; then \
+         transformed_name=gdb-add-index ; \
+       else \
+         true ; \
+       fi ; \
+       rm -f $(DESTDIR)$(bindir)/$$transformed_name
        @$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
 
 # The C++ name parser can be built standalone for testing.

diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index a9ca88a689639d6edc94650464cda14719ad5747..0a2381bf51cf5c4b0232546ddcca1e873800db62 100644 (file)
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -326,7 +326,10 @@ install-strip:
 uninstall: force
        n=`echo gdbserver | sed '$(program_transform_name)'`; \
        if [ x$$n = x ]; then n=gdbserver; else true; fi; \
-       rm -f $(DESTDIR)/$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(man1dir)/$$n.1
+       if [ x"$(IPA_DEPFILES)" != x ]; then \
+               rm -f $(DESTDIR)$(libdir)/$(IPA_LIB); \
+       fi; \
+       rm -f $(DESTDIR)/$(bindir)/$$n$(EXEEXT)
 
 installcheck:
 check: