vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2009-09-23 Colin Watson <cjwatson@ubuntu.com> 

* 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.
This commit is contained in:
cjwatson 2009-09-23 17:18:06 +00:00
parent d96875df6e
commit ff42022396
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2009-09-23 Colin Watson <cjwatson@ubuntu.com>
* 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 <fzielcke@z-51.de>
* util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Cope with `*.dpkg-*'

13
Makefile.in
View File

@ -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

1
configure.ac
View File

@ -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)