From 5307078763e6ceae894ef72e34599e02da265b28 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Wed, 18 Sep 2013 20:26:16 +0200 Subject: [PATCH] * util/grub-mkconfig_lib.in: Keep supplied pkgdatadir if any. --- ChangeLog | 4 ++++ util/grub-mkconfig_lib.in | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c8edd1ff2..3cf7ffe6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * docs/grub.texi (Networking commands): Add documentation for network related commands. +2013-09-18 Vladimir Serbinenko + + * util/grub-mkconfig_lib.in: Keep supplied pkgdatadir if any. + 2013-09-18 Vladimir Serbinenko * grub-core/kern/mm.c (grub_mm_init_region): Skip regions less than diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in index b48e2af60..016d8c51b 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -20,7 +20,9 @@ datarootdir="@datarootdir@" datadir="@datadir@" bindir="@bindir@" sbindir="@sbindir@" -pkgdatadir="${datadir}/@PACKAGE@" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/@PACKAGE@" +fi if test "x$grub_probe" = x; then grub_probe="${sbindir}/@grub_probe@"