From patchwork Thu Jun 24 15:54:14 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Joseph Myers <joseph@codesourcery.com>
X-Patchwork-Id: 56807
Return-Path: 
 <gcc-patches-return-266253-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id 66ED9B6F35
	for <incoming@patchwork.ozlabs.org>;
	Fri, 25 Jun 2010 01:54:24 +1000 (EST)
Received: (qmail 18602 invoked by alias); 24 Jun 2010 15:54:22 -0000
Received: (qmail 18586 invoked by uid 22791); 24 Jun 2010 15:54:21 -0000
X-SWARE-Spam-Status: No, hits=-1.9 required=5.0	tests=AWL, BAYES_00,
	T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from mail.codesourcery.com (HELO mail.codesourcery.com)
	(38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with
	ESMTP; Thu, 24 Jun 2010 15:54:17 +0000
Received: (qmail 1166 invoked from network); 24 Jun 2010 15:54:15 -0000
Received: from unknown (HELO digraph.polyomino.org.uk) (joseph@127.0.0.2) by
	mail.codesourcery.com with ESMTPA; 24 Jun 2010 15:54:15 -0000
Received: from jsm28 (helo=localhost)	by digraph.polyomino.org.uk with
	local-esmtp (Exim 4.69)	(envelope-from
	<joseph@codesourcery.com>)	id 1ORoko-0001WS-7R	for
	gcc-patches@gcc.gnu.org; Thu, 24 Jun 2010 15:54:14 +0000
Date: Thu, 24 Jun 2010 15:54:14 +0000 (UTC)
From: "Joseph S. Myers" <joseph@codesourcery.com>
To: gcc-patches@gcc.gnu.org
Subject: Fix update_web_docs_svn for Ada manual
Message-ID: <Pine.LNX.4.64.1006241552460.4402@digraph.polyomino.org.uk>
MIME-Version: 1.0
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

A recent Ada change broke the nightly update_web_docs_svn run because the 
generated gnat_ugn_unw.texi was including a file projects.texi from the 
source directory and that script wasn't using appropriate -I options for 
this file to be found.  I've applied this patch to fix this.

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 161314)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2010-06-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* update_web_docs_svn: Also pass -I option pointing to ada/ source
+	directory for Ada manual.
+
 2010-04-16  Joseph Myers  <joseph@codesourcery.com>
 
 	* crontab: Enable 4.6 snapshots.
Index: update_web_docs_svn
===================================================================
--- update_web_docs_svn	(revision 161314)
+++ update_web_docs_svn	(working copy)
@@ -153,10 +153,14 @@
 for file in $MANUALS; do
   filename=`find . -name ${file}.texi`
   if [ "${filename}" ]; then
-    makeinfo --html -I ${includedir} -I `dirname ${filename}` -o ${file} ${filename}
+    includes="-I ${includedir} -I `dirname ${filename}`"
+    if [ "$file" = "gnat_ugn_unw" ]; then
+      includes="$includes -I gcc/gcc/ada"
+    fi
+    makeinfo --html $includes -o ${file} ${filename}
     tar cf ${file}-html.tar ${file}/*.html
-    texi2dvi -I ${includedir} -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
-    texi2pdf -I ${includedir} -o ${file}.pdf ${filename} </dev/null
+    texi2dvi $includes -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
+    texi2pdf $includes -o ${file}.pdf ${filename} </dev/null
     mkdir -p $DOCSDIR/$file
   fi
 done