From patchwork Tue Jul 1 08:18:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masaki Muranaka X-Patchwork-Id: 1831 Received: (qmail 29505 invoked by alias); 1 Jul 2014 08:18:33 -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 29485 invoked by uid 89); 1 Jul 2014 08:18:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-la0-f42.google.com Received: from mail-la0-f42.google.com (HELO mail-la0-f42.google.com) (209.85.215.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 01 Jul 2014 08:18:30 +0000 Received: by mail-la0-f42.google.com with SMTP id pn19so5668107lab.15 for ; Tue, 01 Jul 2014 01:18:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=5uWFzB7PExv/A6LiC0HQ8F/oxAbuFddf+2Ig4xMLyqw=; b=kBWCwgrfplQDw50lNM1UvAeC22fJ68Yvg0w7a5kEWX4eWHFCKtI6b3iL1QjrPnhVJ8 DS/C4Uw4kvAgkb4Gtt+tPRQa81aWIsDqrdVGmw0k3cYALWvCKFq9LATZeDZfSupPstLq ns7b3ZZ4ECpTJey//BYXBKf9M7DS6IZ9Fw4L2/xjtyNcK3VyR2blwoGj2YSPaap1/SJg tPkWhDtsPqz0DZMBrMOixqu4xPassk/qd+ZrLj+KFOUSVfMkNpvJ2jy27l5eF8ULusgU e2L53ILlPJqoWwFQjYI5NTPQoyJiDp3fhknEsewTmp+sMfP5TrG6VTuZd2axeTPGY31n ymJQ== X-Gm-Message-State: ALoCoQlhzgpkqFod4sN1RJSm55oHViPY3YErPVPFJLDxXi5t2okRurTLZljL2GFBB5YD/yhVWbPU MIME-Version: 1.0 X-Received: by 10.112.131.8 with SMTP id oi8mr298710lbb.87.1404202705661; Tue, 01 Jul 2014 01:18:25 -0700 (PDT) Received: by 10.114.21.193 with HTTP; Tue, 1 Jul 2014 01:18:25 -0700 (PDT) Date: Tue, 1 Jul 2014 17:18:25 +0900 Message-ID: Subject: [doc] Avoid conflicts between gdb and cross-gdb. From: Masaki Muranaka To: gdb-patches@sourceware.org X-IsSubscribed: yes 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. + 2014-05-09 Samuel Bronson * 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