blob: ab202885eea4e0585ff9f849c456d1d9531731db (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
Description: Copy .mo files from @datadir@/locale
This matches where 'make install' puts them.
Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/2265
Bug-Ubuntu: https://bugs.launchpad.net/bugs/537998
Forwarded: http://lists.gnu.org/archive/html/grub-devel/2010-03/msg00074.html
Last-Update: 2010-03-22
diff -Nur -x '*.orig' -x '*~' grub2/util/grub-install.in grub2.new/util/grub-install.in
--- grub2/util/grub-install.in 2010-03-22 15:49:32.000000000 +0000
+++ grub2.new/util/grub-install.in 2010-03-22 15:54:31.000000000 +0000
@@ -32,6 +32,7 @@
host_os=@host_os@
font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+localedir=@datadir@/locale
grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
@@ -245,9 +246,9 @@
# Copy gettext files
mkdir -p ${grubdir}/locale/
-for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
- if test -f "$file"; then
- cp -f "$file" ${grubdir}/locale/
+for dir in ${localedir}/*; do
+ if test -f "$dir/LC_MESSAGES/grub.mo"; then
+ cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
fi
done
diff -Nur -x '*.orig' -x '*~' grub2/util/i386/efi/grub-install.in grub2.new/util/i386/efi/grub-install.in
--- grub2/util/i386/efi/grub-install.in 2010-03-09 16:14:00.000000000 +0000
+++ grub2.new/util/i386/efi/grub-install.in 2010-03-22 15:54:31.000000000 +0000
@@ -31,6 +31,7 @@
platform=@platform@
host_os=@host_os@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+localedir=@datadir@/locale
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
@@ -182,9 +183,9 @@
# Copy gettext files
mkdir -p ${grubdir}/locale/
-for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
- if test -f "$file"; then
- cp -f "$file" ${grubdir}/locale/
+for dir in ${localedir}/*; do
+ if test -f "$dir/LC_MESSAGES/grub.mo"; then
+ cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
fi
done
|
