From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1F7T1H-0005qR-N8 for qemu-devel@nongnu.org; Fri, 10 Feb 2006 02:48:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1F7T1G-0005pk-JB for qemu-devel@nongnu.org; Fri, 10 Feb 2006 02:48:43 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1F7T1G-0005pd-DW for qemu-devel@nongnu.org; Fri, 10 Feb 2006 02:48:42 -0500 Received: from [217.24.0.78] (helo=legolas.otaku42.de) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1F7T4y-0003rU-Ur for qemu-devel@nongnu.org; Fri, 10 Feb 2006 02:52:33 -0500 Received: from dslb-084-058-148-172.pools.arcor-ip.net ([84.58.148.172] helo=localhost ident=otaku) by legolas.otaku42.de with esmtpa (Exim 4.50 and XAMS 0.0.11) id 1F7T1D-0003CH-Vr for qemu-devel@nongnu.org; Fri, 10 Feb 2006 08:48:40 +0100 Subject: Re: [Qemu-devel] [PATCH][RFC] Make documentation optional From: Michael Renzmann In-Reply-To: <1139557403.5264.25.camel@gimli> References: <1139557403.5264.25.camel@gimli> Content-Type: multipart/mixed; boundary="=-D0DyUlPr4oPT0Ec4Ndai" Date: Fri, 10 Feb 2006 08:48:39 +0100 Message-Id: <1139557720.5264.28.camel@gimli> Mime-Version: 1.0 Reply-To: mrenzmann@otaku42.de, qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --=-D0DyUlPr4oPT0Ec4Ndai Content-Type: text/plain Content-Transfer-Encoding: 7bit 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. Bye, Mike --=-D0DyUlPr4oPT0Ec4Ndai Content-Disposition: attachment; filename=qemu-cvs-docs.diff Content-Type: text/x-patch; name=qemu-cvs-docs.diff; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 7bit 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 @@ -28,6 +28,7 @@ # avoid old build problems by removing potentially incorrect old files rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~ + rm -f $(DOCS) $(MAKE) -C tests clean for d in $(TARGET_DIRS); do \ $(MAKE) -C $$d $@ || exit 1 ; \ @@ -43,7 +44,7 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr -install: all +install: all mkdir -p "$(bindir)" install -m 755 -s $(TOOLS) "$(bindir)" mkdir -p "$(datadir)" @@ -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)" + if [ -f "./*.html" ]; then \ + mkdir -p "$(docdir)" ; \ + install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" ; \ + else \ + echo "INFO: skipped installation of HTML documentation" ; \ + fi ifndef CONFIG_WIN32 - mkdir -p "$(mandir)/man1" - install qemu.1 qemu-img.1 "$(mandir)/man1" + if [ -f "./*.1" ]; then \ + mkdir -p "$(mandir)/man1" ; \ + install qemu.1 qemu-img.1 "$(mandir)/man1" ; \ + else \ + echo "INFO: skipped installation of man pages" ; \ + fi mkdir -p "$(datadir)/keymaps" install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps" endif @@ -78,15 +87,27 @@ # documentation %.html: %.texi - texi2html -monolithic -number $< + if [ -n "$(shell which texi2html)" ]; then \ + texi2html -monolithic -number $< ; \ + else \ + echo "WARNING: texi2html not found, skipped generation of" $< ; \ + fi qemu.1: qemu-doc.texi - ./texi2pod.pl $< qemu.pod - 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 > $@ + if [ -n "$(shell which pod2man)" ]; then \ + ./texi2pod.pl $< qemu-img.pod ; \ + pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@ ; \ + else \ + echo "WARNING: pod2man not found, skipped generation of" $@ ; \ + fi FILE=qemu-$(shell cat VERSION) --=-D0DyUlPr4oPT0Ec4Ndai--