[2625] 2009-10-06 Colin Watson <[email protected]>
Colin Watson <[email protected]> Mon, 05 Oct 2009 23:55:49 +0000
| Newsgroups | gmane.comp.boot-loaders.grub.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 2625
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2625
Author: cjwatson
Date: 2009-10-05 23:55:48 +0000 (Mon, 05 Oct 2009)
Log Message:
-----------
2009-10-06 Colin Watson <[email protected]>
* Makefile.in: Don't set info_INFOS unless makeinfo was found.
Fixes bug #27602.
Ticket Links:
:-----------
http://savannah.gnu.org/bugs/?27602
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/Makefile.in
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-10-05 23:33:36 UTC (rev 2624)
+++ trunk/grub2/ChangeLog 2009-10-05 23:55:48 UTC (rev 2625)
@@ -1,5 +1,10 @@
2009-10-06 Colin Watson <[email protected]>
+ * Makefile.in: Don't set info_INFOS unless makeinfo was found.
+ Fixes bug #27602.
+
+2009-10-06 Colin Watson <[email protected]>
+
* util/i386/pc/grub-install.in: Source
${libdir}/grub/grub-mkconfig_lib before option processing, in order
that the --grub-probe option will work.
Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in 2009-10-05 23:33:36 UTC (rev 2624)
+++ trunk/grub2/Makefile.in 2009-10-05 23:55:48 UTC (rev 2625)
@@ -174,7 +174,9 @@
parttool.lst: $(PARTTOOLFILES)
cat $^ /dev/null | sort | uniq > $@
+ifneq (true, $(MAKEINFO))
info_INFOS += docs/grub.info
+endif
MOSTLYCLEANFILES += vti.tmp
MAINTAINER_CLEANFILES += docs/stamp-vti docs/version.texi