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

Replace PACKAGE_TARNAME with PACKAGE in pkglibdir and pkgdatadir.

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-27 11:04:50 +01:00
parent 7d5d60f7c8
commit 2311c5caa9
11 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
Replace PACKAGE_TARNAME with PACKAGE in pkglibdir and pkgdatadir.
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* po/POTFILES.in: Regenerated.

4
util/grub-install.in
View File

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

2
util/grub-kbdcomp.in
View File

@ -8,7 +8,7 @@ bindir="@bindir@"
datarootdir="@datarootdir@"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
pkgdatadir="${datadir}/@PACKAGE@"
fi
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@
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
pkgdatadir="${datadir}/@PACKAGE@"
fi
grub_cfg=""
grub_mkconfig_dir="${sysconfdir}"/grub.d

2
util/grub-mkconfig_lib.in
View File

@ -22,7 +22,7 @@ datarootdir="@datarootdir@"
datadir="@datadir@"
bindir="@bindir@"
sbindir="@sbindir@"
pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
pkgdatadir="${datadir}/@PACKAGE@"
if test "x$grub_probe" = x; then
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"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
pkgdatadir="${datadir}/@PACKAGE@"
fi
self=`basename $0`
@ -46,13 +46,13 @@ recheck=no
debug=no
debug_image=
subdir=`echo /boot/grub | sed ${transform}`
pc_dir="${libdir}/${PACKAGE_TARNAME}/i386-pc"
ppc_dir="${libdir}/${PACKAGE_TARNAME}/powerpc-ieee1275"
sparc_dir="${libdir}/${PACKAGE_TARNAME}/sparc64-ieee1275"
i386_ieee1275_dir="${libdir}/${PACKAGE_TARNAME}/i386-ieee1275"
efi32_dir="${libdir}/${PACKAGE_TARNAME}/i386-efi"
efi64_dir="${libdir}/${PACKAGE_TARNAME}/x86_64-efi"
itanium_dir="${libdir}/${PACKAGE_TARNAME}/ia64-efi"
pc_dir="${libdir}/@PACKAGE@/i386-pc"
ppc_dir="${libdir}/@PACKAGE@/powerpc-ieee1275"
sparc_dir="${libdir}/@PACKAGE@/sparc64-ieee1275"
i386_ieee1275_dir="${libdir}/@PACKAGE@/i386-ieee1275"
efi32_dir="${libdir}/@PACKAGE@/i386-efi"
efi64_dir="${libdir}/@PACKAGE@/x86_64-efi"
itanium_dir="${libdir}/@PACKAGE@/ia64-efi"
. "${pkgdatadir}/grub-mkconfig_lib"

14
util/grub-mkrescue.in
View File

@ -31,18 +31,18 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
pkgdatadir="${datadir}/@PACKAGE@"
fi
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
self=`basename $0`
multiboot_dir="${libdir}/${PACKAGE_TARNAME}/i386-multiboot"
coreboot_dir="${libdir}/${PACKAGE_TARNAME}/i386-coreboot"
qemu_dir="${libdir}/${PACKAGE_TARNAME}/i386-qemu"
pc_dir="${libdir}/${PACKAGE_TARNAME}/i386-pc"
efi32_dir="${libdir}/${PACKAGE_TARNAME}/i386-efi"
efi64_dir="${libdir}/${PACKAGE_TARNAME}/x86_64-efi"
multiboot_dir="${libdir}/@PACKAGE@/i386-multiboot"
coreboot_dir="${libdir}/@PACKAGE@/i386-coreboot"
qemu_dir="${libdir}/@PACKAGE@/i386-qemu"
pc_dir="${libdir}/@PACKAGE@/i386-pc"
efi32_dir="${libdir}/@PACKAGE@/i386-efi"
efi64_dir="${libdir}/@PACKAGE@/x86_64-efi"
rom_directory=
override_dir=
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"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
pkgdatadir="${datadir}/@PACKAGE@"
fi
self=`basename $0`
@ -58,7 +58,7 @@ usage () {
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]")"
# TRANSLATORS: platform here isn't identifier. It can be translated.
dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/<platform>]" "${libdir}/${PACKAGE_TARNAME}")"
dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/<platform>]" "${libdir}/@PACKAGE@")"
printf " -d, --directory=%-8s%s\n" \
"DIR" "$dir_msg"
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)
cpu=mipsel ;;
esac
source_directory="${libdir}/${PACKAGE_TARNAME}/$cpu-$platform"
source_directory="${libdir}/@PACKAGE@/$cpu-$platform"
fi
. "${source_directory}"/modinfo.sh

2
util/grub-reboot.in
View File

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

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

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

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

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