1 --- grub-1.99~rc2/conf/Makefile.common~ 2011-09-08 12:39:42.000000000 +0200
2 +++ grub-1.99~rc2/conf/Makefile.common 2011-09-08 13:12:11.194868113 +0200
5 grubconfdir = /lib/grub.d
6 grubdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
7 -platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
8 +platformdir = $(pkglibrootdir)
10 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
11 CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
12 --- grub-1.99~rc2/util/grub-install.in~ 2011-04-03 15:36:21.000000000 +0200
13 +++ grub-1.99~rc2/util/grub-install.in 2011-09-06 22:18:41.574849650 +0200
15 target_cpu=@target_cpu@
18 -pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`"
19 +pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME} | sed ${transform}`"
20 localedir="@datadir@/locale"
27 -# Copy the GRUB images to the GRUB directory.
28 -for file in "${grubdir}"/*.mod "${grubdir}"/*.lst "${grubdir}"/*.img "${grubdir}"/efiemu??.o; do
29 - if test -f "$file" && [ "`basename $file`" != menu.lst ]; then
30 - rm -f "$file" || exit 1
33 -for file in "${pkglibdir}"/*.mod "${pkglibdir}"/*.lst; do
34 - cp -f "$file" "${grubdir}" || exit 1
36 -if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
37 - for file in "${pkglibdir}"/*.img "${pkglibdir}"/efiemu??.o; do
38 - if test -f "$file"; then
39 - cp -f "$file" "${grubdir}" || exit 1
45 mkdir -p "${grubdir}"/locale/
46 for dir in "${localedir}"/*; do