From ff4202239622d4cce8dceb67d02401f602b14640 Mon Sep 17 00:00:00 2001 From: cjwatson Date: Wed, 23 Sep 2009 17:18:06 +0000 Subject: [PATCH] 2009-09-23 Colin Watson * 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. --- ChangeLog | 8 ++++++++ Makefile.in | 13 ++++++++----- configure.ac | 1 + 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfdbc5a43..dc343d1d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-09-23 Colin Watson + + * 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 * util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Cope with `*.dpkg-*' diff --git a/Makefile.in b/Makefile.in index ee4589a78..363d696f1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,6 +59,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ 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 @@ MOSTLYCLEANFILES += vti.tmp 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) -@rm -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 diff --git a/configure.ac b/configure.ac index e827a32c2..4d221b4d6 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,7 @@ done AC_PROG_INSTALL AC_PROG_AWK AC_PROG_MAKE_SET +AC_PROG_MKDIR_P # These are not a "must". AC_PATH_PROG(RUBY, ruby)