[2610] 2009-09-23 Colin Watson <address@hidden>

[Colin Watson]

Revision: 2610
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2610
Author:   cjwatson
Date:     2009-09-23 17:18:06 +0000 (Wed, 23 Sep 2009)
Log Message:
-----------
2009-09-23  Colin Watson  <address@hidden>

        * configure.ac: Call AC_PROG_MKDIR_P.
        * Makefile.in (docs/stamp-vti): Create docs directory.  Create
        version.texi in $(builddir) rather than $(srcdir).
        (docs/grub.info): Create docs directory.  Prepend $(builddir)/docs
        to makeinfo's @include search path.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/Makefile.in
    trunk/grub2/configure.ac

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-09-23 09:46:08 UTC (rev 2609)
+++ trunk/grub2/ChangeLog       2009-09-23 17:18:06 UTC (rev 2610)
@@ -1,3 +1,11 @@
+2009-09-23  Colin Watson  <address@hidden>
+
+       * configure.ac: Call AC_PROG_MKDIR_P.
+       * Makefile.in (docs/stamp-vti): Create docs directory.  Create
+       version.texi in $(builddir) rather than $(srcdir).
+       (docs/grub.info): Create docs directory.  Prepend $(builddir)/docs
+       to makeinfo's @include search path.
+
 2009-09-23  Felix Zielcke  <address@hidden>
 
        * util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Cope with 
`*.dpkg-*'

Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in     2009-09-23 09:46:08 UTC (rev 2609)
+++ trunk/grub2/Makefile.in     2009-09-23 17:18:06 UTC (rev 2610)
@@ -59,6 +59,7 @@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+MKDIR_P = @MKDIR_P@
 
 mkinstalldirs = $(srcdir)/mkinstalldirs
 
@@ -179,20 +180,22 @@
 MAINTAINER_CLEANFILES += docs/stamp-vti docs/version.texi
 docs/version.texi: docs/stamp-vti
 docs/stamp-vti: docs/grub.texi
+       $(MKDIR_P) docs
        (set `$(SHELL) $(srcdir)/docs/mdate-sh $<`; \
        echo "@set UPDATED $$1 $$2 $$3"; \
        echo "@set UPDATED-MONTH $$2 $$3"; \
        echo "@set EDITION $(PACKAGE_VERSION)"; \
        echo "@set VERSION $(PACKAGE_VERSION)") > vti.tmp
-       @cmp -s vti.tmp $(srcdir)/docs/version.texi \
-         || (echo "Updating $(srcdir)/docs/version.texi"; \
-             cp vti.tmp $(srcdir)/docs/version.texi)
+       @cmp -s vti.tmp $(builddir)/docs/version.texi \
+         || (echo "Updating $(builddir)/docs/version.texi"; \
+             cp vti.tmp $(builddir)/docs/version.texi)
        address@hidden -f vti.tmp
-       @cp $(srcdir)/docs/version.texi $@
+       @cp $(builddir)/docs/version.texi $@
 
 # Use --force until such time as the documentation is cleaned up.
 docs/grub.info: docs/grub.texi docs/version.texi docs/fdl.texi
-       $(MAKEINFO) --no-split --force $< -o $@ || :
+       $(MKDIR_P) docs
+       $(MAKEINFO) -P $(builddir)/docs --no-split --force $< -o $@ || :
 
 ifeq (, $(UNIFONT_BDF))
 else

Modified: trunk/grub2/configure.ac
===================================================================
--- trunk/grub2/configure.ac    2009-09-23 09:46:08 UTC (rev 2609)
+++ trunk/grub2/configure.ac    2009-09-23 17:18:06 UTC (rev 2610)
@@ -144,6 +144,7 @@
 AC_PROG_INSTALL
 AC_PROG_AWK
 AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
 
 # These are not a "must".
 AC_PATH_PROG(RUBY, ruby)