From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QczCM-0000JB-Ef for mharc-grub-devel@gnu.org; Sat, 02 Jul 2011 08:21:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QczCJ-0000IQ-Jg for grub-devel@gnu.org; Sat, 02 Jul 2011 08:21:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QczCD-0006QU-7D for grub-devel@gnu.org; Sat, 02 Jul 2011 08:21:19 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:65034) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QczCC-0006QB-Mo for grub-devel@gnu.org; Sat, 02 Jul 2011 08:21:12 -0400 Received: by wyg36 with SMTP id 36so3287902wyg.0 for ; Sat, 02 Jul 2011 05:21:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; bh=L6p5klfkIQaPC8/3T59/eGplEzOBlwRI/6zRzJ8ZtF8=; b=EUghAiG6CnASR6yn3LqzgSQhmXvpArKkk9BjBzuspFowX4rQxrpHpiWCQBoPmBqFyh P4j+6rStsGnE4lUvEtQ1CZmgGVje2eFX0QXiuI89bicQOIAqsZtbU60/EnYcYFSoh/7F Luj7PgNXjJyC2wmP2J2Diia7iJZfe+w4gS3QM= Received: by 10.216.9.219 with SMTP id 69mr3584272wet.72.1309609271239; Sat, 02 Jul 2011 05:21:11 -0700 (PDT) Received: from [147.210.128.244] (laptop-147-210-128-244.labri.fr [147.210.128.244]) by mx.google.com with ESMTPS id l53sm2030945weq.47.2011.07.02.05.21.09 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 02 Jul 2011 05:21:10 -0700 (PDT) Message-ID: <4E0F0D34.4030500@gmail.com> Date: Sat, 02 Jul 2011 14:21:08 +0200 From: =?UTF-8?B?R3LDqWdvaXJlIFN1dHJl?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110606 Iceowl/1.0b2 Icedove/3.1.10 MIME-Version: 1.0 To: The development of GRUB 2 Subject: [PATCH] Source grub-mkconfig_lib in ${libdir}/@PACKAGE@ Content-Type: multipart/mixed; boundary="------------000508040202050601050409" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.169 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jul 2011 12:21:21 -0000 This is a multi-part message in MIME format. --------------000508040202050601050409 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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 --------------000508040202050601050409 Content-Type: text/x-patch; name="patch-pkglibdir-in-scripts.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-pkglibdir-in-scripts.diff" 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" --------------000508040202050601050409--