Source grub-mkconfig_lib from the build directory at build time.

This commit is contained in:
Grégoire Sutre 2012-02-10 18:16:27 +01:00
parent ebcecdf1c3
commit c8d9ead677
11 changed files with 54 additions and 13 deletions

View file

@ -34,6 +34,9 @@ platform=@platform@
host_os=@host_os@
pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
localedir="@datadir@/locale"
self="`basename $0`"
@ -77,7 +80,7 @@ else
disk_module=native
fi
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
. "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage
# Print the usage.

View file

@ -7,12 +7,15 @@ exec_prefix="@exec_prefix@"
bindir="@bindir@"
datarootdir="@datarootdir@"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
grub_mklayout="${bindir}/`echo grub-mklayout | sed ${transform}`"
ckbcomp_options=""
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
. "${pkgdatadir}/grub-mkconfig_lib"
self=`basename $0`

View file

@ -31,7 +31,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
host_os=@host_os@
datadir="@datadir@"
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
grub_cfg=""
grub_mkconfig_dir="${sysconfdir}"/grub.d
@ -42,7 +44,7 @@ grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
. "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage
# Print the usage.
@ -95,8 +97,6 @@ do
esac
done
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
if [ "x$EUID" = "x" ] ; then
EUID=`id -u`
fi

View file

@ -30,6 +30,9 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
host_os=@host_os@
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0`
@ -52,7 +55,7 @@ efi32_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi"
efi64_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi"
itanium_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/ia64-efi"
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
. "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage
# Print the usage.

View file

@ -30,6 +30,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
self=`basename $0`
@ -46,7 +49,7 @@ grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
xorriso=xorriso
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
. "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage
# Print the usage.

View file

@ -31,6 +31,9 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0`
@ -40,7 +43,7 @@ format=
grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
source=
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
. "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage
# Print the usage.

View file

@ -26,6 +26,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
datarootdir="@datarootdir@"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0`
@ -34,7 +37,7 @@ rootdir=
bootdir=
grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
. "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage
# Print the usage.

View file

@ -26,6 +26,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
datarootdir="@datarootdir@"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0`
@ -34,7 +37,7 @@ rootdir=
bootdir=
grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
. "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage
# Print the usage.

View file

@ -32,12 +32,15 @@ platform=@platform@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
datarootdir="@datarootdir@"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0`
grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
. "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage
# Print the usage.