This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[doc] Avoid conflicts between gdb and cross-gdb.
- From: Masaki Muranaka <monaka at monami-software dot com>
- To: gdb-patches at sourceware dot org
- Date: Tue, 1 Jul 2014 17:18:25 +0900
- Subject: [doc] Avoid conflicts between gdb and cross-gdb.
- Authentication-results: sourceware.org; auth=none
Hello,
After applied 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.
I think this should be fixed by adding the target triplet.
>From e89f13505363c41b683a1b02125f1fea02aa486c Mon Sep 17 00:00:00 2001
From: Masaki Muranaka <monaka@monami-software.com>
Date: Tue, 1 Jul 2014 17:08:15 +0900
Subject: [PATCH] Add target triplet to man files.
---
gdb/doc/ChangeLog | 4 ++++
gdb/doc/Makefile.in | 6 ++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 7c1d1bb..10b1114 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-01 Masaki Muranaka <monaka@monami-software.com>
+
+ * Makefile.in : Add target triplet to man files.
+
2014-05-09 Samuel Bronson <naesten@gmail.com>
* Makefile.in (PACKAGE): Copy from ../Makefile.in in case of
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index c9c8c85..d32bd1a 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
--
2.0.0