* util/grub-install.in: Copy .mo files from @datadir@/locale, to
match where 'make install' puts them. * util/i386/efi/grub-install.in: Likewise.
This commit is contained in:
parent
c9f5842752
commit
bed1d3524e
|
@ -1,3 +1,9 @@
|
||||||
|
2010-03-21 Colin Watson <cjwatson@ubuntu.com>
|
||||||
|
|
||||||
|
* util/grub-install.in: Copy .mo files from @datadir@/locale, to
|
||||||
|
match where 'make install' puts them.
|
||||||
|
* util/i386/efi/grub-install.in: Likewise.
|
||||||
|
|
||||||
2010-03-19 Colin Watson <cjwatson@ubuntu.com>
|
2010-03-19 Colin Watson <cjwatson@ubuntu.com>
|
||||||
|
|
||||||
* .bzrignore: Add gentrigtables, grub-script-check,
|
* .bzrignore: Add gentrigtables, grub-script-check,
|
||||||
|
|
|
@ -32,6 +32,7 @@ platform=@platform@
|
||||||
host_os=@host_os@
|
host_os=@host_os@
|
||||||
font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
|
font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
|
||||||
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
|
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
|
||||||
|
localedir=@datadir@/locale
|
||||||
|
|
||||||
grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
|
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
|
if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
|
||||||
|
@ -263,9 +264,9 @@ fi
|
||||||
|
|
||||||
# Copy gettext files
|
# Copy gettext files
|
||||||
mkdir -p ${grubdir}/locale/
|
mkdir -p ${grubdir}/locale/
|
||||||
for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
|
for dir in ${localedir}/*; do
|
||||||
if test -f "$file"; then
|
if test -f "$dir/LC_MESSAGES/grub.mo"; then
|
||||||
cp -f "$file" ${grubdir}/locale/
|
cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@ 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}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
|
||||||
|
localedir=@datadir@/locale
|
||||||
|
|
||||||
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
|
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
|
||||||
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
|
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
|
||||||
|
@ -182,9 +183,9 @@ done
|
||||||
|
|
||||||
# Copy gettext files
|
# Copy gettext files
|
||||||
mkdir -p ${grubdir}/locale/
|
mkdir -p ${grubdir}/locale/
|
||||||
for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
|
for dir in ${localedir}/*; do
|
||||||
if test -f "$file"; then
|
if test -f "$dir/LC_MESSAGES/grub.mo"; then
|
||||||
cp -f "$file" ${grubdir}/locale/
|
cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue