[PATCH] Source grub-mkconfig_lib in ${libdir}/@PACKAGE@

[PATCH] Source grub-mkconfig_lib in ${libdir}/@PACKAGE@

[Grégoire Sutre]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

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

[-- Attachment #2: patch-pkglibdir-in-scripts.diff --]
[-- Type: text/x-patch, Size: 3833 bytes --]

The file grub-mkconfig_lib is installed into $libdir/@PACKAGE@.

=== modified file 'util/grub-mkconfig.in'
--- util/grub-mkconfig.in	2011-05-20 10:21:36 +0000
+++ util/grub-mkconfig.in	2011-07-02 11:35:12 +0000
@@ -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'
--- util/grub.d/00_header.in	2011-04-06 11:18:11 +0000
+++ util/grub.d/00_header.in	2011-07-02 11:35:12 +0000
@@ -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'
--- util/grub.d/10_hurd.in	2011-02-09 11:23:11 +0000
+++ util/grub.d/10_hurd.in	2011-07-02 11:35:12 +0000
@@ -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'
--- util/grub.d/10_kfreebsd.in	2011-03-29 10:01:48 +0000
+++ util/grub.d/10_kfreebsd.in	2011-07-02 11:35:12 +0000
@@ -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'
--- util/grub.d/10_linux.in	2011-05-14 20:47:28 +0000
+++ util/grub.d/10_linux.in	2011-07-02 11:35:12 +0000
@@ -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'
--- util/grub.d/10_netbsd.in	2011-01-10 00:08:40 +0000
+++ util/grub.d/10_netbsd.in	2011-07-02 11:35:12 +0000
@@ -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'
--- util/grub.d/10_windows.in	2010-06-29 15:20:49 +0000
+++ util/grub.d/10_windows.in	2011-07-02 11:35:12 +0000
@@ -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'
--- util/grub.d/20_linux_xen.in	2011-05-17 17:10:29 +0000
+++ util/grub.d/20_linux_xen.in	2011-07-02 11:35:12 +0000
@@ -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'
--- util/grub.d/30_os-prober.in	2010-12-25 17:16:01 +0000
+++ util/grub.d/30_os-prober.in	2011-07-02 11:35:12 +0000
@@ -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'
--- util/update-grub_lib.in	2008-11-20 19:22:20 +0000
+++ util/update-grub_lib.in	2011-07-02 11:35:12 +0000
@@ -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"

Re: [PATCH] Source grub-mkconfig_lib in ${libdir}/@PACKAGE@

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 568 bytes --]

On 02.07.2011 14:21, Grégoire Sutre wrote:
> Hi,
>
> The file grub-mkconfig_lib is installed in $(pkglibdir), which is
> defined (by automake) as:
>
> pkglibdir = $(libdir)/@PACKAGE@
>
go ahead
> 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
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel


-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 294 bytes --]

Re: [PATCH] Source grub-mkconfig_lib in ${libdir}/@PACKAGE@

[Grégoire Sutre]

On 07/02/2011 03:01 PM, Vladimir 'φ-coder/phcoder' Serbinenko wrote:
> On 02.07.2011 14:21, Grégoire Sutre wrote:
>> 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