vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't transform PACKAGE_TARNAME following a discussion on autoconf

Browse source 
mailing list.

	* util/grub-install.in: Don't transform PACKAGE_TARNAME.
	* util/grub-kbdcomp.in: Likewise.
	* util/grub-mkconfig.in: Likewise.
	* util/grub-mkconfig_lib.in: Likewise.
	* util/grub-mknetdir.in: Likewise.
	* util/grub-mkrescue.in: Likewise.
	* util/grub-mkstandalone.in: Likewise.
	* util/grub-reboot.in: Likewise.
	* util/grub-set-default.in: Likewise.
	* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 18:37:54 +01:00
parent 47454da510
commit fc847818fc
11 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>
Don't transform PACKAGE_TARNAME following a discussion on autoconf
mailing list.
* util/grub-install.in: Don't transform PACKAGE_TARNAME.
* util/grub-kbdcomp.in: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mkconfig_lib.in: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mkstandalone.in: Likewise.
* util/grub-reboot.in: Likewise.
* util/grub-set-default.in: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
2012-02-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>
Remove GRUB_PREFIX. Remove GRUB_PREFIX.

4
util/grub-install.in
View file

@ -32,10 +32,10 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
target_cpu=@target_cpu@ target_cpu=@target_cpu@
platform=@platform@ platform=@platform@
host_os=@host_os@ host_os=@host_os@
pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`" pkglibdir="${libdir}/${PACKAGE_TARNAME}/${target_cpu}-${platform}"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi fi
localedir="@datadir@/locale" localedir="@datadir@/locale"

2
util/grub-kbdcomp.in
View file

@ -8,7 +8,7 @@ bindir="@bindir@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi fi
grub_mklayout="${bindir}/`echo grub-mklayout | sed ${transform}`" grub_mklayout="${bindir}/`echo grub-mklayout | sed ${transform}`"

2
util/grub-mkconfig.in
View file

@ -32,7 +32,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
host_os=@host_os@ host_os=@host_os@
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi fi
grub_cfg="" grub_cfg=""
grub_mkconfig_dir="${sysconfdir}"/grub.d grub_mkconfig_dir="${sysconfdir}"/grub.d

2
util/grub-mkconfig_lib.in
View file

@ -22,7 +22,7 @@ datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
bindir="@bindir@" bindir="@bindir@"
sbindir="@sbindir@" sbindir="@sbindir@"
pkgdatadir="${datadir}/`echo "@PACKAGE_TARNAME@" | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
if test "x$grub_probe" = x; then if test "x$grub_probe" = x; then
grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`" grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"

16
util/grub-mknetdir.in
View file

@ -31,7 +31,7 @@ host_os=@host_os@
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi fi
self=`basename $0` self=`basename $0`
@ -46,13 +46,13 @@ recheck=no
debug=no debug=no
debug_image= debug_image=
subdir=`echo /boot/grub | sed ${transform}` subdir=`echo /boot/grub | sed ${transform}`
pc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc" pc_dir="${libdir}/${PACKAGE_TARNAME}/i386-pc"
ppc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/powerpc-ieee1275" ppc_dir="${libdir}/${PACKAGE_TARNAME}/powerpc-ieee1275"
sparc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/sparc64-ieee1275" sparc_dir="${libdir}/${PACKAGE_TARNAME}/sparc64-ieee1275"
i386_ieee1275_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-ieee1275" i386_ieee1275_dir="${libdir}/${PACKAGE_TARNAME}/i386-ieee1275"
efi32_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi" efi32_dir="${libdir}/${PACKAGE_TARNAME}/i386-efi"
efi64_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi" efi64_dir="${libdir}/${PACKAGE_TARNAME}/x86_64-efi"
itanium_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/ia64-efi" itanium_dir="${libdir}/${PACKAGE_TARNAME}/ia64-efi"
. "${pkgdatadir}/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"

14
util/grub-mkrescue.in
View file

@ -31,18 +31,18 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi fi
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
self=`basename $0` self=`basename $0`
multiboot_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-multiboot" multiboot_dir="${libdir}/${PACKAGE_TARNAME}/i386-multiboot"
coreboot_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-coreboot" coreboot_dir="${libdir}/${PACKAGE_TARNAME}/i386-coreboot"
qemu_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-qemu" qemu_dir="${libdir}/${PACKAGE_TARNAME}/i386-qemu"
pc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc" pc_dir="${libdir}/${PACKAGE_TARNAME}/i386-pc"
efi32_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi" efi32_dir="${libdir}/${PACKAGE_TARNAME}/i386-efi"
efi64_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi" efi64_dir="${libdir}/${PACKAGE_TARNAME}/x86_64-efi"
rom_directory= rom_directory=
override_dir= override_dir=
grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`" grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"

6
util/grub-mkstandalone.in
View file

@ -32,7 +32,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi fi
self=`basename $0` self=`basename $0`
@ -58,7 +58,7 @@ usage () {
printf " -v, --version %s\n" "$(gettext "print the version information and exit")" printf " -v, --version %s\n" "$(gettext "print the version information and exit")"
printf " -o, --output=%-11s%s\n" "$(gettext FILE)" "$(gettext "save output in FILE [required]")" printf " -o, --output=%-11s%s\n" "$(gettext FILE)" "$(gettext "save output in FILE [required]")"
# TRANSLATORS: platform here isn't identifier. It can be translated. # TRANSLATORS: platform here isn't identifier. It can be translated.
dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/<platform>]" "${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})")" dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/<platform>]" "${libdir}/${PACKAGE_TARNAME}")"
printf " -d, --directory=%-8s%s\n" \ printf " -d, --directory=%-8s%s\n" \
"DIR" "$dir_msg" "DIR" "$dir_msg"
printf " -O, --format=%-11s%s" "$(gettext "FORMAT")" "$(gettext "generate an image in format")"; echo printf " -O, --format=%-11s%s" "$(gettext "FORMAT")" "$(gettext "generate an image in format")"; echo
@ -155,7 +155,7 @@ if [ "x$source_directory" = x ] ; then
mips-loongson) mips-loongson)
cpu=mipsel ;; cpu=mipsel ;;
esac esac
source_directory="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/$cpu-$platform" source_directory="${libdir}/${PACKAGE_TARNAME}/$cpu-$platform"
fi fi
. "${source_directory}"/modinfo.sh . "${source_directory}"/modinfo.sh

2
util/grub-reboot.in
View file

@ -27,7 +27,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi fi
self=`basename $0` self=`basename $0`

2
util/grub-set-default.in
View file

@ -27,7 +27,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi fi
self=`basename $0` self=`basename $0`

4
util/powerpc/ieee1275/grub-mkrescue.in
View file

@ -29,11 +29,11 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
target_cpu=@target_cpu@ target_cpu=@target_cpu@
platform=@platform@ platform=@platform@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` pkglibdir="${libdir}/${PACKAGE_TARNAME}/${target_cpu}-${platform}"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi fi
self=`basename $0` self=`basename $0`