From patchwork Thu Mar 4 21:21:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 46979 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8146AB7D08 for ; Fri, 5 Mar 2010 08:21:58 +1100 (EST) Received: from localhost ([127.0.0.1]:49187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnIUV-0002FG-Nk for incoming@patchwork.ozlabs.org; Thu, 04 Mar 2010 16:21:55 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NnITl-0002E3-AI for qemu-devel@nongnu.org; Thu, 04 Mar 2010 16:21:09 -0500 Received: from [199.232.76.173] (port=42555 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnITk-0002DY-Pw for qemu-devel@nongnu.org; Thu, 04 Mar 2010 16:21:08 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NnITj-0001rx-Ex for qemu-devel@nongnu.org; Thu, 04 Mar 2010 16:21:08 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:61685) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NnITi-0001rr-Uz for qemu-devel@nongnu.org; Thu, 04 Mar 2010 16:21:07 -0500 Received: from flocke.weilnetz.de (p54ADFF12.dip.t-dialin.net [84.173.255.18]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0MNvNj-1Nlx2R388Z-006w6o; Thu, 04 Mar 2010 22:21:04 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NnITf-0006wy-Rr; Thu, 04 Mar 2010 22:21:03 +0100 From: Stefan Weil To: QEMU Developers X-Mailer: git-send-email 1.7.0 In-Reply-To: <20100228190141.GT10291@volta.aurel32.net> References: <20100228190141.GT10291@volta.aurel32.net> X-Provags-ID: V01U2FsdGVkX18yw+2K3DJG3EA2Fbku78V/gN4cJAiVrXBrUhR JnTcmioTrTZKXmVCPn0+VZ5zJzi2PcbMsSwWe1H5R4W3/ecPqt 5OfsI2Ue/p+Ll7RZ8fgCqfJhC5l8WTuOuC1Pimb5KwJdHpQ9as oiA== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] Documentation: Modify rule for html output (better looking output format) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To create html output from texi input, texi2html was used. Output from makeinfo looks cleaner, so replace the old rule and use makeinfo now. For those who want to use their own variant of html output, the macros MAKEINFO and MAKEINFOFLAGS allow customisation. Option "-I ." is not needed (the current directory is searched by default), so remove it. Please note that the build requirements changed, too: makeinfo is required for doc builds. texi2html is no longer used. Signed-off-by: Stefan Weil --- Makefile | 7 +++++-- configure | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1f6c3ea..bf2cef2 100644 --- a/Makefile +++ b/Makefile @@ -230,15 +230,18 @@ cscope: cscope -b # documentation +MAKEINFO=makeinfo +MAKEINFOFLAGS=--no-headers --no-split --number-sections TEXIFLAG=$(if $(V),,--quiet) %.dvi: %.texi $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<," GEN $@") %.html: %.texi - $(call quiet-command,texi2html -I=. -monolithic -number $<," GEN $@") + $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \ + " GEN $@") %.info: %.texi - $(call quiet-command,makeinfo -I . $< -o $@," GEN $@") + $(call quiet-command,$(MAKEINFO) $< -o $@," GEN $@") %.pdf: %.texi $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<," GEN $@") diff --git a/configure b/configure index b4db650..19eb620 100755 --- a/configure +++ b/configure @@ -1759,7 +1759,7 @@ fi # Check if tools are available to build documentation. if test "$docs" != "no" ; then - if has texi2html && has pod2man; then + if has makeinfo && has pod2man; then docs=yes else if test "$docs" = "yes" ; then