* util/grub-mkconfig_lib.in: Keep supplied pkgdatadir if any.

diff --git a/ChangeLog b/ChangeLog
index c8edd1ff2d9772949ea8820ef547906ca9fa40b7..3cf7ffe6e8e0bd80e1bf7568f41d81b93cc065dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * docs/grub.texi (Networking commands): Add documentation for
        network related commands.
 
+2013-09-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mkconfig_lib.in: Keep supplied pkgdatadir if any.
+
 2013-09-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * 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 b48e2af60cbf8c5dfeb55143209457d2544bf8a4..016d8c51b595c7e9b13db874e5d0689080753285 100644 (file)
--- 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@"