From: Masaki Muranaka <monaka@monami-software.com>
Date: Fri, 1 Aug 2014 15:01:48 +0000 (-0700)
Subject: [gdb/doc] Add target triplet to man files
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90debf20f4cc4ddd7cfb6356fe0d3876a18604a6;p=binutils-gdb.git

[gdb/doc] Add target triplet to man files

After applying hash 43662968, gdb.1 and other man pages are not added
target triplet even if we configure with --target=.

It causes conflicts on some distributions.
And uninstall rules requires $(transform) variable.

gdb/doc/ChangeLog:

	* Makefile.in (transform): New variable.
	(install-man1, install-man5): Apply $(transform) to man file names.

Tested by installing both native and cross debugger.
---

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 0bfddd7b970..20ce293d0ae 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-01  Masaki Muranaka  <monaka@monami-software.com>
+
+	Pushed by Joel Brobecker  <brobecker@adacore.com>.
+	* Makefile.in (transform): New variable.
+	(install-man1, install-man5): Apply $(transform) to man file names.
+
 2014-07-26  Doug Evans  <xdje42@gmail.com>
 
 	PR guile/17177
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index c9c8c85d6a2..d32bd1af4ee 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -30,6 +30,8 @@ mandir = @mandir@
 man1dir = $(mandir)/man1
 man5dir = $(mandir)/man5
 
+transform = @program_transform_name@
+
 SHELL = @SHELL@
 
 LN_S = @LN_S@
@@ -308,7 +310,7 @@ install-man1: $(MAN1S)
 	    continue; \
 	  fi; \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=`echo $$p | sed -e 's|^.*/||'`; \
+	  f=`echo $$p | sed -e 's|^.*/||' -e '$(transform)'`; \
 	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(man1dir)/$$f'"; \
 	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(man1dir)/$$f"; \
 	done
@@ -317,7 +319,7 @@ install-man5: $(MAN5S)
 	test -z "$(man5dir)" || $(mkinstalldirs) "$(DESTDIR)$(man5dir)"
 	@list='$(MAN5S)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=`echo $$p | sed -e 's|^.*/||'`; \
+	  f=`echo $$p | sed -e 's|^.*/||' -e '$(transform)'`; \
 	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(man5dir)/$$f'"; \
 	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(man5dir)/$$f"; \
 	done