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

Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-11-14 22:28:03 +01:00
commit deca601915
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2013-11-15 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/Makefile.core.def (signature_test): Add missing
tests/signatures.h.
2013-11-14 Colin Watson <cjwatson@ubuntu.com>
* util/grub-install_header: Set localedir here, since this file is
where it's used.
* util/grub-install.in: Remove setting of localedir.
* util/grub-mkrescue.in: Likewise.
2013-11-14 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-14 Vladimir Serbinenko <phcoder@gmail.com>
* Makefile.am (default_payload.elf): Add uhci, ohci and usb_keyboard. * Makefile.am (default_payload.elf): Add uhci, ohci and usb_keyboard.

1
grub-core/Makefile.core.def
View file

@ -1914,6 +1914,7 @@ module = {
module = { module = {
name = signature_test; name = signature_test;
common = tests/signature_test.c; common = tests/signature_test.c;
common = tests/signatures.h;
}; };
module = { module = {

1
util/grub-install.in
View file

@ -22,7 +22,6 @@ sysconfdir="@sysconfdir@"
host_os=@host_os@ host_os=@host_os@
target= target=
localedir="@datadir@/locale"
grub_probe="${sbindir}/@grub_probe@" grub_probe="${sbindir}/@grub_probe@"
grub_editenv="${bindir}/@grub_editenv@" grub_editenv="${bindir}/@grub_editenv@"

1
util/grub-install_header
View file

@ -29,6 +29,7 @@ datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE@" pkgdatadir="${datadir}/@PACKAGE@"
fi fi
localedir="@datadir@/locale"
self=`basename $0` self=`basename $0`

2
util/grub-mkrescue.in
View file

@ -44,8 +44,6 @@ product_version="${PACKAGE_VERSION}"
xorriso=xorriso xorriso=xorriso
localedir="@datadir@/locale"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.
usage () { usage () {