From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FaDTW-0000kK-Eh
	for qemu-devel@nongnu.org; Sun, 30 Apr 2006 11:04:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FaDTV-0000ja-93
	for qemu-devel@nongnu.org; Sun, 30 Apr 2006 11:04:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FaDTV-0000jU-1f
	for qemu-devel@nongnu.org; Sun, 30 Apr 2006 11:04:41 -0400
Received: from [204.127.200.83] (helo=sccrmhc13.comcast.net)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FaDX6-0005v3-No
	for qemu-devel@nongnu.org; Sun, 30 Apr 2006 11:08:24 -0400
Message-ID: <4454D206.4070301@win4lin.com>
Date: Sun, 30 Apr 2006 11:04:38 -0400
From: "Leonardo E. Reiter" <lreiter@win4lin.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] qemu Makefile configure
References: <E1FXiqN-0006DH-5n@savannah.gnu.org>
In-Reply-To: <E1FXiqN-0006DH-5n@savannah.gnu.org>
Content-Type: multipart/mixed; boundary="------------000909030906070100070704"
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: qemu-devel@nongnu.org

This is a multi-part message in MIME format.
--------------000909030906070100070704
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Attached is a patch to fix 'make install' when the docs are not built
(it currently fails).

- Leo Reiter


Paul Brook wrote:
> CVSROOT:	/sources/qemu
> Module name:	qemu
> Branch: 	
> Changes by:	Paul Brook <pbrook@savannah.gnu.org>	06/04/23 17:57:59
> 
> Modified files:
> 	.              : Makefile configure 
> 
> Log message:
> 	Autodetect tools neccessary for building documentation.
> 	Make distclean remove generated documentation files.
> 
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/qemu/qemu/Makefile.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
> http://cvs.savannah.gnu.org/viewcvs/qemu/qemu/configure.diff?tr1=1.93&tr2=1.94&r1=text&r2=text

-- 
Leonardo E. Reiter
Vice President of Product Development, CTO

Win4Lin, Inc.
Virtual Computing that means Business
Main: +1 512 339 7979
Fax: +1 512 532 6501
http://www.win4lin.com

--------------000909030906070100070704
Content-Type: text/x-patch;
 name="qemu-noinstall-doc.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="qemu-noinstall-doc.patch"

Index: Makefile
===================================================================
RCS file: /cvsroot/qemu/qemu/Makefile,v
retrieving revision 1.97
diff -a -u -r1.97 Makefile
--- Makefile	23 Apr 2006 17:57:59 -0000	1.97
+++ Makefile	30 Apr 2006 15:03:51 -0000
@@ -55,11 +55,15 @@
 			video.x proll.elf linux_boot.bin; do \
 		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
 	done
+ifdef BUILD_DOCS
 	mkdir -p "$(DESTDIR)$(docdir)"
 	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+endif
 ifndef CONFIG_WIN32
+ifdef BUILD_DOCS
 	mkdir -p "$(DESTDIR)$(mandir)/man1"
 	$(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+endif
 	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
 	for x in $(KEYMAPS); do \
 		$(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \

--------------000909030906070100070704--