This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [doc] Avoid conflicts between gdb and cross-gdb.
- From: Joel Brobecker <brobecker at adacore dot com>
- To: Masaki Muranaka <monaka at monami-software dot com>
- Cc: gdb-patches at sourceware dot org
- Date: Fri, 1 Aug 2014 08:07:22 -0700
- Subject: Re: [doc] Avoid conflicts between gdb and cross-gdb.
- Authentication-results: sourceware.org; auth=none
- References: <CAJBvFxOPfJU42a-5vk6Uz3UYktAPSwnNekRw19OnuV4jJY0pww at mail dot gmail dot com>
Hello,
On Tue, Jul 01, 2014 at 05:18:25PM +0900, Masaki Muranaka wrote:
> 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.
> +
I am sorry for the late review. In the future, please do not hesitate
to ping us after a couple of weeks, and every week or so thereafter.
The patch makes sense to me. Unfortunately, when I tried to test
the patch, it did not apply. Attached is what I ended up pushing
(I kept you as the author off the git commit).
Please note also how I wrote the ChangeLog entry. We're expected
to write the names of new variables and modified targets in them.
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.
--
Joel
>From 90debf20f4cc4ddd7cfb6356fe0d3876a18604a6 Mon Sep 17 00:00:00 2001
From: Masaki Muranaka <monaka@monami-software.com>
Date: Fri, 1 Aug 2014 08:01:48 -0700
Subject: [PATCH] [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.
---
gdb/doc/ChangeLog | 6 ++++++
gdb/doc/Makefile.in | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 0bfddd7..20ce293 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 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
--
1.9.1