Use @PACKAGE@ instead of hardcoded name when sourcing grub-mkconfig_lib.

diff --git a/ChangeLog b/ChangeLog
index 4b8d8f149a0f991d3362ee6eadf0e5db849297b9..e091265d4f1deab517d98abe7c8dc319b8259d9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-07-02  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+       * util/grub-mkconfig.in: Use @PACKAGE@ instead of hardcoded name when
+       sourcing grub-mkconfig_lib.
+       * util/update-grub_lib.in: Likewise.
+       * util/grub.d/00_header.in: Likewise.
+       * util/grub.d/10_hurd.in: Likewise.
+       * util/grub.d/10_kfreebsd.in: Likewise.
+       * util/grub.d/10_linux.in: Likewise.
+       * util/grub.d/10_netbsd.in: Likewise.
+       * util/grub.d/10_windows.in: Likewise.
+       * util/grub.d/20_linux_xen.in: Likewise.
+       * util/grub.d/30_os-prober.in: Likewise.
+
 2011-06-28  Colin Watson  <cjwatson@ubuntu.com>
 
        * grub-core/term/gfxterm.c (grub_virtual_screen_setup): Use

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 4d627c057b61b27907e55bbd459eed65324018f6..cf94d1065766f7d23329d2a781efaecf371ef810 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -95,7 +95,7 @@ do
     esac
 done
 
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/grub-mkconfig_lib
 
 if [ "x$EUID" = "x" ] ; then
   EUID=`id -u`

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 9da1511f5e48f3113f1eb257af31ba2729191547..7b8871d4de4f8304ff0e3005de9d2fbb1ee6ddd1 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -25,7 +25,7 @@ libdir=@libdir@
 locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
 grub_lang=`echo $LANG | cut -d . -f 1`
 
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/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 8c54eab97b2e650dfb412f49fd465d1f975118b6..9ca01f0a897c04217a931cedf6e8a31ae661bf5b 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -20,7 +20,7 @@ set -e
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/grub-mkconfig_lib
 
 CLASS="--class gnu --class os"
 

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 3600c74f96fcbe81bd5d9498c91bd92f1f84535d..2ade4ea35d58f80e8632022bc859a822f5d36e50 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -21,7 +21,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/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 1d1eb403f3895223fd2d9c4f0feee8e525ff5b87..97e7c65233492fd68c97bff7223ca99b05414c8e 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@
 bindir=@bindir@
 libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/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 ffd31ad93b574bcf6c8a0d65dbf240e3d9b7b9c8..c257aeb3cf03d9aaa2db3ab6415afdfa71e5bf1c 100644 (file)
--- a/util/grub.d/10_netbsd.in
+++ b/util/grub.d/10_netbsd.in
@@ -21,7 +21,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/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 fd068dd2dec4a4e89d8c5b3030a09dfa9b512972..941267a9f113e2713b4c13c050f461f20a104752 100644 (file)
--- a/util/grub.d/10_windows.in
+++ b/util/grub.d/10_windows.in
@@ -20,7 +20,7 @@ set -e
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/grub-mkconfig_lib
 
 case "`uname 2>/dev/null`" in
   CYGWIN*)  ;;

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 083391c4019633638f41ed1ee87fe3c444a29554..c0b255598bdaa1308df59ef270030c1f7e1ddfc5 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@
 bindir=@bindir@
 libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/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 d9d4b0a96d0ff3bce49f1e9815dcad74e95c73af..c0b5d7cd729479e5028e86186e9113c8bb21e026 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -21,7 +21,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/grub-mkconfig_lib
 
 if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
   exit 0

diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index 998452e67c102fe076f31c839abb81f0357a02cf..430ce130824f91e5958ea28839f422d121195a8e 100644 (file)
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -18,6 +18,6 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 
-. ${libdir}/grub/grub-mkconfig_lib
+. ${libdir}/@PACKAGE@/grub-mkconfig_lib
 
 grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"