From patchwork Sun Oct 9 20:00:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Hope X-Patchwork-Id: 4577 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 724C223F58 for ; Sun, 9 Oct 2011 20:00:42 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 57EAEA18053 for ; Sun, 9 Oct 2011 20:00:42 +0000 (UTC) Received: by eya25 with SMTP id 25so2746830eya.11 for ; Sun, 09 Oct 2011 13:00:42 -0700 (PDT) Received: by 10.223.65.68 with SMTP id h4mr26596215fai.24.1318190441989; Sun, 09 Oct 2011 13:00:41 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.23.170 with SMTP id n10cs69032laf; Sun, 9 Oct 2011 13:00:41 -0700 (PDT) Received: by 10.68.36.106 with SMTP id p10mr31535955pbj.66.1318190439870; Sun, 09 Oct 2011 13:00:39 -0700 (PDT) Received: from mail-pz0-f42.google.com (mail-pz0-f42.google.com [209.85.210.42]) by mx.google.com with ESMTPS id c10si3034404pbg.112.2011.10.09.13.00.38 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Oct 2011 13:00:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.42 is neither permitted nor denied by best guess record for domain of michael.hope@linaro.org) client-ip=209.85.210.42; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.42 is neither permitted nor denied by best guess record for domain of michael.hope@linaro.org) smtp.mail=michael.hope@linaro.org Received: by pzk1 with SMTP id 1so14625900pzk.1 for ; Sun, 09 Oct 2011 13:00:38 -0700 (PDT) Received: by 10.68.0.40 with SMTP id 8mr32052663pbb.45.1318190438754; Sun, 09 Oct 2011 13:00:38 -0700 (PDT) Received: from crucis (122-59-216-20.jetstream.xtra.co.nz. [122.59.216.20]) by mx.google.com with ESMTPS id p4sm59090610pbs.6.2011.10.09.13.00.36 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Oct 2011 13:00:37 -0700 (PDT) Date: Mon, 10 Oct 2011 09:00:33 +1300 Message-Id: <8762jyvsta.fsf@linaro.org> From: Michael Hope To: patches@eglibc.org CC: patches@linaro.org Subject: manual/Makefile: fix escaping of PKGVERSION and REPORT_BUGS_TO crosstool-NG uses 'crosstool-NG @ mercurial-revno' as the default package version. This breaks the EGLIBC manuals as '@' starts a Texinfo command. Fix by escaping. I noticed that REPORT_BUGS_TO is broken as well, but in a different way. There's a sed that converts @ into the escaped @@ to allow email style bug URLs, but it applies it to the command as well as the value. I've converted these to GNU make substitutions instead. The change is EGLIBC specific as GLIBC doesn't put the pkgversion in the manual. -- Michael Index: libc/ChangeLog.eglibc =================================================================== --- libc/ChangeLog.eglibc (revision 15493) +++ libc/ChangeLog.eglibc (working copy) @@ -1,3 +1,8 @@ +2011-10-07 Michael Hope + + * manual/Makefile (stamp-pkgvers): Escape PKGVERSION. Fix the + escaping of REPORT_BUGS_TO. + 2011-09-06 Dr. David Alan Gilbert * elf/Makefile: Push tst-initorder through cross-test-wrapper. Index: libc/manual/Makefile =================================================================== --- libc/manual/Makefile (revision 15493) +++ libc/manual/Makefile (working copy) @@ -116,9 +116,8 @@ # Package version and bug reporting URL. pkgvers.texi: stamp-pkgvers stamp-pkgvers: - echo "@set PKGVERSION $(PKGVERSION)" > pkgvers-tmp - echo "@set REPORT_BUGS_TO $(REPORT_BUGS_TO)" \ - | sed -e 's/@/@@/g' >> pkgvers-tmp + echo "@set PKGVERSION $(subst @,@@,$(PKGVERSION))" > pkgvers-tmp + echo "@set REPORT_BUGS_TO $(subst @,@@,$(REPORT_BUGS_TO))" >> pkgvers-tmp $(move-if-change) pkgvers-tmp pkgvers.texi touch $@