grub-mkconfig: use $pkgdatadir in scripts

Otherwise scripts will source wrong grub-mkconfig_lib.

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index d1fae4937e9ccef58d282c1e043ee280bb741d27..3183744bfb19fc01989373502a60ffca684d74c5 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -33,6 +33,9 @@ datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
     pkgdatadir="${datadir}/@PACKAGE@"
 fi
+# export it for scripts
+export pkgdatadir
+
 grub_cfg=""
 grub_mkconfig_dir="${sysconfdir}"/grub.d
 

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index ce2ec819d8c2bbfaea9934ba9217e4394538bc8b..93a90233ead40bfbb9d0994ae41098aa884a36d7 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -25,7 +25,7 @@ grub_lang=`echo $LANG | cut -d . -f 1`
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"
 
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 # Do this as early as possible, since other commands might depend on it.
 # (e.g. the `loadfont' command might need lvm or raid modules)

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 29b455423ceb9f3f09810f735ca2a50e8b9d45f1..59a9a48a2f47a7f17e7095336e1a9f6a5c59d497 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -24,7 +24,7 @@ datarootdir="@datarootdir@"
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"
 
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 CLASS="--class gnu --class os"
 

diff --git a/util/grub.d/10_illumos.in b/util/grub.d/10_illumos.in
index 0de616e8956b669687609c9cc789af018929defd..a133e1b3fa6b5a3202b775e64b9e11f79663ed15 100644 (file)
--- a/util/grub.d/10_illumos.in
+++ b/util/grub.d/10_illumos.in
@@ -20,7 +20,7 @@ set -e
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 65f6c32a09d9240875bb73961b3fb10de7d9db2e..9d8e8fd852cbe888ba02beeef8929159e3b29e84 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -20,7 +20,7 @@ set -e
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index a2a84dce4e09f1de5caed6be8395f6b3cf21e6d7..859b608f6197da7ecc5cc66532d54f60bc80ceaf 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -21,7 +21,7 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
 
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"

diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
index 9988a42bc50d8034d40cddd4b41c6ed756425bd1..874f59969edf38c572f816173e0bbfcc34f4caaa 100644 (file)
--- a/util/grub.d/10_netbsd.in
+++ b/util/grub.d/10_netbsd.in
@@ -20,7 +20,7 @@ set -e
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"

diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in
index 48bd955464bc4d9c0082521dd26f0045ea52197f..554c5614b18f7e3306b0ea718c917d19a5feea4e 100644 (file)
--- a/util/grub.d/10_windows.in
+++ b/util/grub.d/10_windows.in
@@ -24,7 +24,7 @@ datarootdir="@datarootdir@"
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"
 
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 case "`uname 2>/dev/null`" in
   CYGWIN*)  ;;

diff --git a/util/grub.d/10_xnu.in b/util/grub.d/10_xnu.in
index 4270385f3d1785f6cd6631358ead6ff118c53b06..51ee2f427d26bea1334e4722356bda93d43f1ca5 100644 (file)
--- a/util/grub.d/10_xnu.in
+++ b/util/grub.d/10_xnu.in
@@ -24,7 +24,7 @@ datarootdir="@datarootdir@"
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"
 
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 osx_entry() {
     if [ x$2 = x32 ]; then

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index de34c8d73100a2ecf072a2d5f5cf232bb4a8b08b..f532fb98f603d41e04ec3700e25a3707a6bd171d 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -21,7 +21,7 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
 
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 4ee6015659fd41b4b7ae7c82ca7e1cd5917cd206..5fc4f0c835f41ef2541abb98ed6cfc3d0f2c8ff4 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -24,7 +24,7 @@ datarootdir="@datarootdir@"
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"
 
-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
 
 if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
   exit 0