Source grub-mkconfig_lib in ${libdir}/@PACKAGE@
PATCH 1/1 Source grub-mkconfig_lib in ${libdir}/@PACKAGE@
Hi,
The file grub-mkconfig_lib is installed in $(pkglibdir), which is defined (by automake) as:
pkglibdir = $(libdir)/@PACKAGE@
The attached patch makes sure that users of this library look for it in the same place, without relying on PACKAGE=grub.
Grégoire
The file grub-mkconfig_lib is installed into $libdir/@PACKAGE@.
=== modified file 'util/grub-mkconfig.in'
grub-mkconfig.in +1 -1
@@ -95,7 +95,7 @@ esac done -. ${libdir}/grub/grub-mkconfig_lib +. ${libdir}/@PACKAGE@/grub-mkconfig_lib if [ "x$EUID" = "x" ] ; then EUID=`id -u`
=== modified file 'util/grub.d/00_header.in'
grub.d/00_header.in +1 -1
@@ -25,7 +25,7 @@ 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)
=== modified file 'util/grub.d/10_hurd.in'
grub.d/10_hurd.in +1 -1
@@ -20,7 +20,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +. ${libdir}/@PACKAGE@/grub-mkconfig_lib CLASS="--class gnu --class os"
=== modified file 'util/grub.d/10_kfreebsd.in'
grub.d/10_kfreebsd.in +1 -1
@@ -21,7 +21,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +. ${libdir}/@PACKAGE@/grub-mkconfig_lib export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR=@localedir@
=== modified file 'util/grub.d/10_linux.in'
grub.d/10_linux.in +1 -1
@@ -21,7 +21,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +. ${libdir}/@PACKAGE@/grub-mkconfig_lib export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR=@localedir@
=== modified file 'util/grub.d/10_netbsd.in'
grub.d/10_netbsd.in +1 -1
@@ -21,7 +21,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +. ${libdir}/@PACKAGE@/grub-mkconfig_lib export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR=@localedir@
=== modified file 'util/grub.d/10_windows.in'
grub.d/10_windows.in +1 -1
@@ -20,7 +20,7 @@ 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*) ;;
=== modified file 'util/grub.d/20_linux_xen.in'
grub.d/20_linux_xen.in +1 -1
@@ -21,7 +21,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +. ${libdir}/@PACKAGE@/grub-mkconfig_lib export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR=@localedir@
=== modified file 'util/grub.d/30_os-prober.in'
grub.d/30_os-prober.in +1 -1
@@ -21,7 +21,7 @@ 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
=== modified file 'util/update-grub_lib.in'
update-grub_lib.in +1 -1
@@ -18,6 +18,6 @@ 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"
Quoted 7 lines · Grégoire Sutre
Hi,
The file grub-mkconfig_lib is installed in $(pkglibdir), which is defined (by automake) as:
pkglibdir = $(libdir)/@PACKAGE@
go ahead
Quoted 10 lines
The attached patch makes sure that users of this library look for it in the same place, without relying on PACKAGE=grub.
Grégoire
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Signature · 2 lines
Regards Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 9 lines · Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 7 lines · Grégoire Sutre
Hi,
The file grub-mkconfig_lib is installed in $(pkglibdir), which is defined (by automake) as:
pkglibdir = $(libdir)/@PACKAGE@
go ahead
Thanks. It's committed.
Grégoire