From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1F7U04-0007aS-9D
	for qemu-devel@nongnu.org; Fri, 10 Feb 2006 03:51:32 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1F7U02-0007aG-3x
	for qemu-devel@nongnu.org; Fri, 10 Feb 2006 03:51:31 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1F7U01-0007aD-Lg
	for qemu-devel@nongnu.org; Fri, 10 Feb 2006 03:51:30 -0500
Received: from [195.3.96.94] (helo=email.aon.at)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1F7U3k-0000hD-Qp
	for qemu-devel@nongnu.org; Fri, 10 Feb 2006 03:55:21 -0500
Date: Fri, 10 Feb 2006 09:54:06 +0100
From: Bernhard Fischer <rep.nop@aon.at>
Subject: Re: [Qemu-devel] [PATCH][RFC] Make documentation optional
Message-ID: <20060210085406.GA17813@aon.at>
References: <1139557403.5264.25.camel@gimli> <1139557720.5264.28.camel@gimli>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1139557720.5264.28.camel@gimli>
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: mrenzmann@otaku42.de, qemu-devel@nongnu.org

On Fri, Feb 10, 2006 at 08:48:39AM +0100, Michael Renzmann wrote:
>Hi again.
>
>On Fri, 2006-02-10 at 08:43 +0100, Michael Renzmann wrote:
>> The attached patch ...
>
>... contained some stuff that should have been ignored by diff. Sorry,
>revised patch attached to this mail.

>diff -urN qemu-cvs/Makefile qemu-cvs-o42/Makefile
>--- qemu-cvs/Makefile	2006-02-08 23:39:17.000000000 +0100
>+++ qemu-cvs-o42/Makefile	2006-02-10 08:31:17.000000000 +0100
>@@ -52,11 +53,19 @@
>                        pc-bios/ppc_rom.bin pc-bios/video.x \
>                        pc-bios/proll.elf \
>                        pc-bios/linux_boot.bin "$(datadir)"
>-	mkdir -p "$(docdir)"
>-	install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"

What about just doing this
	-install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
>@@ -78,15 +87,27 @@
> 
> # documentation
> %.html: %.texi
>-	texi2html -monolithic -number $<
>+	if [ -n "$(shell which texi2html)" ]; then \
>+	    texi2html -monolithic -number $< ; \

same here:
	-texi2html -monolithic -number $< ;
>-	pod2man --section=1 --center=" " --release=" " qemu.pod > $@
>+	if [ -n "$(shell which pod2man)" ]; then \
>+		./texi2pod.pl $< qemu.pod ; \
>+		pod2man --section=1 --center=" " --release=" " qemu.pod > $@ ; \
>+	else \
>+		echo "WARNING: pod2man not found, skipped generation of" $@ ; \
>+	fi
> 
> qemu-img.1: qemu-img.texi
>-	./texi2pod.pl $< qemu-img.pod
>-	pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@

ditto:
	-pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@