From af7d4de5c2b0bcf40961ae5194a6fa230170d977 Mon Sep 17 00:00:00 2001 From: Felix Zielcke Date: Wed, 11 Nov 2009 17:00:27 +0100 Subject: [PATCH] 2009-11-11 Felix Zielcke Fix the generation of the man page. * util/pc/i386/grub-install.in: Source `${libdir}/grub/grub-mkconfig_lib' after options have been parsed. --- ChangeLog | 7 +++++++ util/i386/pc/grub-install.in | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b27b5e290..4e868b5b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-11-11 Felix Zielcke + + Fix the generation of the man page. + + * util/pc/i386/grub-install.in: Source + `${libdir}/grub/grub-mkconfig_lib' after options have been parsed. + 2009-11-11 Robert Millan Large file support for grub-mkisofs. diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in index 8a06213cb..356e161e7 100644 --- a/util/i386/pc/grub-install.in +++ b/util/i386/pc/grub-install.in @@ -31,9 +31,6 @@ target_cpu=@target_cpu@ platform=@platform@ pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` -# for make_system_path_relative_to_its_root() -. ${libdir}/grub/grub-mkconfig_lib - grub_setup=${sbindir}/`echo grub-setup | sed ${transform}` if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` @@ -144,6 +141,9 @@ for option in "$@"; do esac done +# for make_system_path_relative_to_its_root() +. ${libdir}/grub/grub-mkconfig_lib + if test "x$install_device" = x; then echo "install_device not specified." 1>&2 usage