diff -urp grub2.orig/Makefile.in grub2/Makefile.in --- grub2.orig/Makefile.in 2007-01-25 05:03:31.000000000 +0100 +++ grub2/Makefile.in 2007-01-25 05:09:07.000000000 +0100 @@ -52,6 +52,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +transform = @program_transform_name@ mkinstalldirs = $(srcdir)/mkinstalldirs CC = @CC@ @@ -139,18 +140,18 @@ install-local: all $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_UTILITIES)'; for file in $$list; do \ if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \ - dest="`echo $$file | sed 's,.*/,,'`"; \ + dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \ done $(mkinstalldirs) $(DESTDIR)$(sbindir) @list='$(sbin_UTILITIES)'; for file in $$list; do \ if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \ - dest="`echo $$file | sed 's,.*/,,'`"; \ + dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \ done @list='$(sbin_SCRIPTS)'; for file in $$list; do \ if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \ - dest="`echo $$file | sed 's,.*/,,'`"; \ + dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \ done @@ -164,11 +165,11 @@ uninstall: rm -f $(DESTDIR)$(pkglibdir)/$$dest; \ done @list='$(bin_UTILITIES)'; for file in $$list; do \ - dest="`echo $$file | sed 's,.*/,,'`"; \ + dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ rm -f $(DESTDIR)$(bindir)/$$dest; \ done @list='$(sbin_UTILITIES) $(sbin_SCRIPTS)'; for file in $$list; do \ - dest="`echo $$file | sed 's,.*/,,'`"; \ + dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ rm -f $(DESTDIR)$(sbindir)/$$dest; \ done diff -urp grub2.orig/configure.ac grub2/configure.ac --- grub2.orig/configure.ac 2007-01-25 05:03:31.000000000 +0100 +++ grub2/configure.ac 2007-01-25 05:03:48.000000000 +0100 @@ -40,6 +40,9 @@ AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST AC_CANONICAL_TARGET +# Program name transformations +AC_ARG_PROGRAM + case "$host_cpu" in powerpc64) host_m32=1 ;; esac diff -urp grub2.orig/util/i386/pc/grub-install.in grub2/util/i386/pc/grub-install.in --- grub2.orig/util/i386/pc/grub-install.in 2007-01-25 05:03:31.000000000 +0100 +++ grub2/util/i386/pc/grub-install.in 2007-01-25 05:19:55.000000000 +0100 @@ -29,11 +29,12 @@ address@hidden@ address@hidden@ address@hidden@ pkglibdir=${libdir}/${PACKAGE_TARNAME}/${target_cpu}-${platform} address@hidden@ -grub_setup=${sbindir}/grub-setup -grub_mkimage=${bindir}/grub-mkimage -grub_mkdevicemap=${sbindir}/grub-mkdevicemap -grub_probe=${sbindir}/grub-probe +grub_setup=${sbindir}/`echo grub-setup | sed ${transform}` +grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` +grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` +grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` rootdir= grub_prefix=/boot/grub modules= diff -urp grub2.orig/util/powerpc/ieee1275/grub-install.in grub2/util/powerpc/ieee1275/grub-install.in --- grub2.orig/util/powerpc/ieee1275/grub-install.in 2007-01-25 05:03:31.000000000 +0100 +++ grub2/util/powerpc/ieee1275/grub-install.in 2007-01-25 05:20:23.000000000 +0100 @@ -31,8 +31,9 @@ address@hidden@ address@hidden@ address@hidden@ pkglibdir=${libdir}/${PACKAGE_TARNAME}/${target_cpu}-${platform} address@hidden@ -grub_mkimage=${bindir}/grub-mkimage +grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` rootdir= grub_prefix=/boot/grub modules=