Received: from list by lists.gnu.org with archive (Exim 4.71) id 1YkbVh-0005dc-UL for mharc-grub-devel@gnu.org; Tue, 21 Apr 2015 12:58:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkbVg-0005dP-2n for grub-devel@gnu.org; Tue, 21 Apr 2015 12:58:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkbVb-0000XE-Ue for grub-devel@gnu.org; Tue, 21 Apr 2015 12:58:56 -0400 Received: from mail-la0-x229.google.com ([2a00:1450:4010:c03::229]:35485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkbVb-0000Wq-HN for grub-devel@gnu.org; Tue, 21 Apr 2015 12:58:51 -0400 Received: by labbd9 with SMTP id bd9so156048517lab.2 for ; Tue, 21 Apr 2015 09:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=XKwtRd1KTBSu4CiaPwkauTAo1Gg911uRluJm+Qjw8zQ=; b=kJ/iTxcDrpVTzfM1sBWYCN8mAsxReXQjswrY0/YGefX4CboFzx8dDHNSG7+vfy4GhM OF8qV3ZgIFIpL6p+IyR1adOP6m74AD7ScaWKBilu6Q7S/qKHD/QSoGG15Yink6PHmjxR fNRCX6BH+DttiJHL31ZsVCveHOCjDUqi91pwSyfTrQXK8tx1W3eoI2JZVeJluWGspIRN soa71Vfy349zEF6PoLaSZL8RgewMwExSu0/CplnasM9vPBrAGf8EJX/Gtd2SpqZYWf85 wD1kVTg3fMBQzkH4jqXM1YoA6bPp71Oc3b6E8sHSTYhvTfGEg/Hi02lCaPNhffEjy0FI 3yZg== X-Received: by 10.152.5.170 with SMTP id t10mr20885084lat.43.1429635530084; Tue, 21 Apr 2015 09:58:50 -0700 (PDT) Received: from opensuse.site.site (ppp91-76-14-38.pppoe.mtu-net.ru. [91.76.14.38]) by mx.google.com with ESMTPSA id jq15sm528244lab.27.2015.04.21.09.58.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Apr 2015 09:58:49 -0700 (PDT) From: Andrei Borzenkov To: grub-devel@gnu.org Subject: [PATCH] grub-mkconfig: use $pkgdatadir in scripts Date: Tue, 21 Apr 2015 19:58:35 +0300 Message-Id: <1429635515-6734-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::229 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: Tue, 21 Apr 2015 16:58:57 -0000 Otherwise scripts will source wrong grub-mkconfig_lib. --- util/grub-mkconfig.in | 3 +++ util/grub.d/00_header.in | 2 +- util/grub.d/10_hurd.in | 2 +- util/grub.d/10_illumos.in | 2 +- util/grub.d/10_kfreebsd.in | 2 +- util/grub.d/10_linux.in | 2 +- util/grub.d/10_netbsd.in | 2 +- util/grub.d/10_windows.in | 2 +- util/grub.d/10_xnu.in | 2 +- util/grub.d/20_linux_xen.in | 2 +- util/grub.d/30_os-prober.in | 2 +- 11 files changed, 13 insertions(+), 10 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index d1fae49..3183744 100644 --- 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 ce2ec81..93a9023 100644 --- 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 29b4554..59a9a48 100644 --- 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 0de616e..a133e1b 100644 --- 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 65f6c32..9d8e8fd 100644 --- 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 a2a84dc..859b608 100644 --- 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 9988a42..874f599 100644 --- 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 48bd955..554c561 100644 --- 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 4270385..51ee2f4 100644 --- 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 de34c8d..f532fb9 100644 --- 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 4ee6015..5fc4f0c 100644 --- 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 -- tg: (677dcaa..) u/pkgdatadir (depends on: master)