[binutils-gdb] Fix 'uninstall' target

[binutils-gdb] Fix 'uninstall' target

[Tom Tromey]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=aab00c2dff7511883e46735ef5e4582acd4d9911

commit aab00c2dff7511883e46735ef5e4582acd4d9911
Author: Tom Tromey <tromey@adacore.com>
Date:   Tue Oct 19 12:44:56 2021 -0600

    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:
---
 gdb/Makefile.in       | 12 ++++++++++--
 gdbserver/Makefile.in |  5 ++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index ec5d332c145..b22394a65b4 100644
--- 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 a9ca88a6896..0a2381bf51c 100644
--- 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: