From patchwork Fri Aug 1 15:07:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Brobecker X-Patchwork-Id: 2285 Received: (qmail 28700 invoked by alias); 1 Aug 2014 15:07:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 28664 invoked by uid 89); 1 Aug 2014 15:07:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 01 Aug 2014 15:07:23 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 43151116243; Fri, 1 Aug 2014 11:07:21 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id YSw7K3TTcWVF; Fri, 1 Aug 2014 11:07:21 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 10B5C116263; Fri, 1 Aug 2014 11:07:21 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id 110C547740; Fri, 1 Aug 2014 08:07:22 -0700 (PDT) Date: Fri, 1 Aug 2014 08:07:22 -0700 From: Joel Brobecker To: Masaki Muranaka Cc: gdb-patches@sourceware.org Subject: Re: [doc] Avoid conflicts between gdb and cross-gdb. Message-ID: <20140801150722.GJ14672@adacore.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) 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 > 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 > + > + * 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. From 90debf20f4cc4ddd7cfb6356fe0d3876a18604a6 Mon Sep 17 00:00:00 2001 From: Masaki Muranaka 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 + + Pushed by Joel Brobecker . + * Makefile.in (transform): New variable. + (install-man1, install-man5): Apply $(transform) to man file names. + 2014-07-26 Doug Evans 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