Hi.
On Fri, 2006-02-10 at 10:33 +0100, Bernhard Fischer wrote:
> >That would work, but the user won't be noticed of the fact that parts of
> >the documentation isn't generated.
> Not quite, you'll get
> texi2html -monolithic etc failed
> make: Error (ignored)
>
> and the build will move on.
Uhm... yeah, you're right. /me is a bit out of order this morning, it
seems :)
Attached is the revised patch. It makes make ignore errors related to
texi2html and/or pod2man are not available. In addition, documentation
files are now included in the "clean" target (forgot to mention that for
the first version of the patch).
Bye, Mike
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 10:45:32.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)"
@@ -53,10 +54,10 @@
pc-bios/proll.elf \
pc-bios/linux_boot.bin "$(datadir)"
mkdir -p "$(docdir)"
- install -m 644 qemu-doc.html qemu-tech.html "$(docdir)"
+ -install -m 644 qemu-doc.html qemu-tech.html "$(docdir)"
ifndef CONFIG_WIN32
mkdir -p "$(mandir)/man1"
- install qemu.1 qemu-img.1 "$(mandir)/man1"
+ -install qemu.1 qemu-img.1 "$(mandir)/man1"
mkdir -p "$(datadir)/keymaps"
install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps"
endif
@@ -78,15 +79,15 @@
# documentation
%.html: %.texi
- texi2html -monolithic -number $<
+ -texi2html -monolithic -number $<
qemu.1: qemu-doc.texi
./texi2pod.pl $< qemu.pod
- pod2man --section=1 --center=" " --release=" " qemu.pod > $@
+ -pod2man --section=1 --center=" " --release=" " qemu.pod > $@
qemu-img.1: qemu-img.texi
./texi2pod.pl $< qemu-img.pod
- pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
+ -pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
FILE=qemu-$(shell cat VERSION)
_______________________________________________
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel
