=== modified file 'ChangeLog' --- ChangeLog 2010-06-03 20:34:49 +0000 +++ ChangeLog 2010-06-03 21:36:19 +0000 @@ -1,5 +1,29 @@ 2010-06-03 Grégoire Sutre + * configure.ac: Set and subsitute pkgdatadir, pkglibrootdir and + defaultbootdir. + * Makefile.in: Use the above autoconfigured variables. + * util/grub-install.in: Likewise, and simplify usage message. + * util/grub-mkrescue.in: Likewise. + * util/grub-reboot.in: Likewise. + * util/grub-set-default.in: Likewise. + * util/grub.d/10_hurd.in: Likewise. + * util/grub.d/10_kfreebsd.in: Likewise. + * util/grub.d/10_linux.in: Likewise. + * util/grub.d/10_netbsd.in: Likewise. + * util/grub.d/10_windows.in: Likewise. + * util/grub.d/30_os-prober.in: Likewise. + * util/i386/efi/grub-install.in: Likewise. + * util/ieee1275/grub-install.in: Likewise. + * util/powerpc/ieee1275/grub-mkrescue.in: Likewise. + * util/update-grub_lib.in: Likewise. + * util/grub-mkconfig.in: Likewise. + (GRUB_DIR): Export new variable. + * util/grub-mkconfig_lib.in: Likewise, and use device.map in GRUB_DIR. + * util/grub.d/00_header.in: Likewise, and use GRUB_DIR. + +2010-06-03 Grégoire Sutre + Make --version uniform and avoid hard-coded program name. * util/grub-mkimage.c (main): Use `program_name' instead of === modified file 'Makefile.in' --- Makefile.in 2010-05-18 11:55:26 +0000 +++ Makefile.in 2010-06-03 21:36:19 +0000 @@ -39,8 +39,9 @@ localedir = @localedir@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ -pkgdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'` -pkglibdir = $(libdir)/`echo @PACKAGE_TARNAME@/$(target_cpu)-$(platform) | sed '$(transform)'` +pkgdatadir = @pkgdatadir@ +pkglibrootdir = @pkglibrootdir@ +pkglibdir = $(pkglibrootdir)/$(target_cpu)-$(platform) # Internationalization library. LIBINTL = @LIBINTL@ @@ -90,7 +91,7 @@ GNULIB_CFLAGS = $(GNULIB_UTIL_CFLAGS) $( ASFLAGS = @ASFLAGS@ LDFLAGS = @LDFLAGS@ $(LIBS) CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \ - -DGRUB_PKGLIBROOTDIR=\"$(libdir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`\" -DLOCALEDIR=\"$(localedir)\" + -DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\" -DLOCALEDIR=\"$(localedir)\" TARGET_CC = @TARGET_CC@ TARGET_CFLAGS = -ffreestanding @TARGET_CFLAGS@ TARGET_ASFLAGS = -nostdinc -fno-builtin @TARGET_ASFLAGS@ @@ -355,12 +356,12 @@ install-local: all dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \ done - $(SHELL) $(mkinstalldirs) $(DESTDIR)$(libdir)/grub + $(SHELL) $(mkinstalldirs) $(DESTDIR)$(pkglibrootdir) @list='$(lib_SCRIPTS)'; \ for file in $$list; do \ if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ dest="`echo $$file | sed 's,.*/,,'`"; \ - $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \ + $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibrootdir)/$$dest; \ done @langs='$(LINGUAS)'; \ for lang in $$langs; do \ @@ -412,7 +413,7 @@ uninstall: @list='$(lib_SCRIPTS)'; \ for file in $$list; do \ dest="`echo $$file | sed 's,.*/,,'`"; \ - rm -f $(DESTDIR)$(libdir)/grub/$$dest; \ + rm -f $(DESTDIR)$(pkglibrootdir)/$$dest; \ done @list='$(info_INFOS)'; \ for file in $$list; do \ === modified file 'configure.ac' --- configure.ac 2010-05-28 17:13:48 +0000 +++ configure.ac 2010-06-03 21:36:19 +0000 @@ -798,6 +798,27 @@ fi AC_SUBST(ASFLAGS) +# Additional names and paths to be substituted in makefiles and scripts. +pkgdatadir=${datadir}/`echo ${PACKAGE_TARNAME} | sed "${program_transform_name}"` +pkglibrootdir=${libdir}/`echo ${PACKAGE_TARNAME} | sed "${program_transform_name}"` + +case "$host_os" in +netbsd* | openbsd*) + # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub + # instead of /boot/grub. + defaultbootdir= + ;; +*) + # Use /boot/grub by default. + defaultbootdir=/boot + ;; +esac +defaultbootdir=${defaultbootdir}/`echo ${PACKAGE_TARNAME} | sed "${program_transform_name}"` + +AC_SUBST([pkgdatadir]) +AC_SUBST([pkglibrootdir]) +AC_SUBST([defaultbootdir]) + # Output files. grub_CHECK_LINK_DIR if test x"$link_dir" = xyes ; then === modified file 'util/grub-install.in' --- util/grub-install.in 2010-06-03 20:34:49 +0000 +++ util/grub-install.in 2010-06-03 21:36:19 +0000 @@ -29,10 +29,11 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ address@hidden@/@PACKAGE_TARNAME@/ascii.pf2 -pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` address@hidden@ +pkglibdir=${pkglibrootdir}/${target_cpu}-${platform} address@hidden@/locale address@hidden@ self=`basename $0` @@ -42,7 +43,6 @@ grub_mkdevicemap=${sbindir}/`echo grub-m grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= -grub_prefix=`echo /boot/grub | sed ${transform}` modules= install_device= @@ -91,13 +91,11 @@ EOF fi cat <. EOF @@ -155,7 +153,7 @@ for option in "$@"; do done # for make_system_path_relative_to_its_root() -. ${libdir}/grub/grub-mkconfig_lib +. ${pkglibrootdir}/grub-mkconfig_lib if test "x$install_device" = x && test "${target_cpu}-${platform}" != "mips-yeeloong"; then echo "install_device not specified." 1>&2 @@ -171,20 +169,7 @@ if test $debug = yes; then fi # Initialize these directories here, since ROOTDIR was initialized. -case "$host_os" in -netbsd* | openbsd*) - # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub - # instead of /boot/grub. - grub_prefix=`echo /grub | sed ${transform}` - bootdir=${rootdir} - ;; -*) - # Use /boot/grub by default. - bootdir=${rootdir}/boot - ;; -esac - -grubdir=${bootdir}/`echo grub | sed ${transform}` +grubdir=${rootdir}${defaultbootdir} device_map=${grubdir}/device.map grub_probe="${grub_probe} --device-map=${device_map}" @@ -358,8 +343,10 @@ if [ "${target_cpu}-${platform}" = "i386 $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \ ${install_device} || exit 1 elif [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then + # XXX hard-coded /boot (use ${grubdir} or ${defaultbootdir} ?) $grub_mkimage ${config_opt} -f ${font} -d ${pkglibdir} -O ${mkimage_target} --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1 else + # XXX hard-coded /boot (use ${grubdir} or ${defaultbootdir} ?) $grub_mkimage -O ${mkimage_target} ${config_opt} -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1 fi === modified file 'util/grub-mkconfig.in' --- util/grub-mkconfig.in 2010-06-03 20:34:49 +0000 +++ util/grub-mkconfig.in 2010-06-03 21:36:19 +0000 @@ -25,10 +25,11 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"` address@hidden@ address@hidden@ address@hidden@ grub_cfg="" grub_mkconfig_dir=${sysconfdir}/grub.d @@ -86,19 +87,33 @@ if $next_grub_cfg; then exit 1 fi -. ${libdir}/grub/grub-mkconfig_lib +set $grub_mkdevicemap dummy +if test -f "$1"; then + : +else + echo "$1: Not found." 1>&2 + exit 1 +fi + +set $grub_probe dummy +if test -f "$1"; then + : +else + echo "$1: Not found." 1>&2 + exit 1 +fi + +GRUB_DIR=${defaultbootdir} + +# Create the GRUB directory if it is not present. +mkdir -p ${GRUB_DIR} || exit 1 + +# This must be done before sourcing grub-mkconfig_lib. +if test -e ${GRUB_DIR}/device.map ; then : ; else + ${grub_mkdevicemap} --device-map=${GRUB_DIR}/device.map +fi -case "$host_os" in -netbsd* | openbsd*) - # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub - # instead of /boot/grub. - grub_prefix=`echo /grub | sed ${transform}` - ;; -*) - # Use /boot/grub by default. - grub_prefix=`echo /boot/grub | sed ${transform}` - ;; -esac +. ${pkglibrootdir}/grub-mkconfig_lib if [ "x$EUID" = "x" ] ; then EUID=`id -u` @@ -121,28 +136,6 @@ if [ "$EUID" != 0 ] ; then fi fi -set $grub_mkdevicemap dummy -if test -f "$1"; then - : -else - echo "$1: Not found." 1>&2 - exit 1 -fi - -set $grub_probe dummy -if test -f "$1"; then - : -else - echo "$1: Not found." 1>&2 - exit 1 -fi - -mkdir -p ${grub_prefix} - -if test -e ${grub_prefix}/device.map ; then : ; else - ${grub_mkdevicemap} -fi - # Device containing our userland. Typically used for root= parameter. GRUB_DEVICE="`${grub_probe} --target=device /`" GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true @@ -174,7 +167,7 @@ fi for x in ${GRUB_TERMINAL_OUTPUT}; do if [ "x${x}" = "xgfxterm" ]; then # If this platform supports gfxterm, try to use it. - if ! test -e ${grub_prefix}/gfxterm.mod ; then + if ! test -e ${GRUB_DIR}/gfxterm.mod ; then if [ "x$termoutdefault" != "x1" ]; then echo "gfxterm isn't available on your platform" >&2 ; exit 1 fi @@ -183,7 +176,7 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do fi # FIXME: this should do something smarter than just loading first # video backend. - GRUB_VIDEO_BACKEND=$(head -n 1 ${grub_prefix}/video.lst || true) + GRUB_VIDEO_BACKEND=$(head -n 1 ${GRUB_DIR}/video.lst || true) if [ -z "${GRUB_VIDEO_BACKEND}" ] ; then if [ "x$termoutdefault" != "x1" ]; then echo "No suitable backend could be found for gfxterm." >&2 ; exit 1 @@ -198,7 +191,7 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do exit 1 fi else - for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do + for dir in ${GRUB_DIR} ${pkgdatadir} /boot/grub /usr/share/grub ; do for basename in unicode unifont ascii; do path="${dir}/${basename}.pf2" if is_path_readable_by_grub ${path} > /dev/null ; then @@ -239,6 +232,7 @@ export GRUB_DEVICE \ GRUB_DEVICE_UUID \ GRUB_DEVICE_BOOT \ GRUB_DEVICE_BOOT_UUID \ + GRUB_DIR \ GRUB_FS \ GRUB_FONT_PATH \ GRUB_PRELOAD_MODULES \ @@ -281,7 +275,7 @@ if test "x${grub_cfg}" != "x"; then chmod 400 ${grub_cfg}.new || grub_warn "Could not make ${grub_cfg}.new readable by only root.\ This means that if the generated config contains a password it is readable by everyone" fi -echo "Generating grub.cfg ..." >&2 +echo "Generating grub configuration ..." >&2 cat << EOF # === modified file 'util/grub-mkconfig_lib.in' --- util/grub-mkconfig_lib.in 2010-05-27 14:38:16 +0000 +++ util/grub-mkconfig_lib.in 2010-06-03 21:36:19 +0000 @@ -22,7 +22,7 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"` address@hidden@ if test "x$grub_probe" = x; then grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` @@ -31,6 +31,13 @@ if test "x$grub_mkrelpath" = x; then grub_mkrelpath=${bindir}/`echo grub-mkrelpath | sed ${transform}` fi +# GRUB_DIR should be set before sourcing this file, but let's be safe. +if test "x${GRUB_DIR}" != "x"; then + if test -e "${GRUB_DIR}/device.map"; then + grub_probe="${grub_probe} --device-map=${GRUB_DIR}/device.map" + fi +fi + if $(which gettext >/dev/null 2>/dev/null) ; then gettext="gettext" else === modified file 'util/grub-mkrescue.in' --- util/grub-mkrescue.in 2010-06-03 20:34:49 +0000 +++ util/grub-mkrescue.in 2010-06-03 21:36:19 +0000 @@ -28,16 +28,17 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ pkglib_DATA="@pkglib_DATA@" self=`basename $0` -multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-multiboot -coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-coreboot -qemu_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-qemu -pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc -efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi -efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi +multiboot_dir=${pkglibrootdir}/i386-multiboot +coreboot_dir=${pkglibrootdir}/i386-coreboot +qemu_dir=${pkglibrootdir}/i386-qemu +pc_dir=${pkglibrootdir}/i386-pc +efi32_dir=${pkglibrootdir}/i386-efi +efi64_dir=${pkglibrootdir}/x86_64-efi rom_directory= override_dir= grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` === modified file 'util/grub-reboot.in' --- util/grub-reboot.in 2010-06-03 20:34:49 +0000 +++ util/grub-reboot.in 2010-06-03 21:36:19 +0000 @@ -24,6 +24,7 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ self=`basename $0` @@ -81,20 +82,7 @@ if test "x$entry" = x; then fi # Initialize these directories here, since ROOTDIR was initialized. -case "$host_os" in -netbsd* | openbsd*) - # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub - # instead of /boot/grub. - grub_prefix=`echo /grub | sed ${transform}` - bootdir=${rootdir} - ;; -*) - # Use /boot/grub by default. - bootdir=${rootdir}/boot - ;; -esac - -grubdir=${bootdir}/`echo grub | sed ${transform}` +grubdir=${rootdir}${defaultbootdir} prev_saved_entry=`$grub_editenv ${grubdir}/grubenv list | sed -n 's/^saved_entry=//p'` if [ "$prev_saved_entry" ]; then === modified file 'util/grub-set-default.in' --- util/grub-set-default.in 2010-06-03 20:34:49 +0000 +++ util/grub-set-default.in 2010-06-03 21:36:19 +0000 @@ -24,6 +24,7 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ self=`basename $0` @@ -81,20 +82,7 @@ if test "x$entry" = x; then fi # Initialize these directories here, since ROOTDIR was initialized. -case "$host_os" in -netbsd* | openbsd*) - # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub - # instead of /boot/grub. - grub_prefix=`echo /grub | sed ${transform}` - bootdir=${rootdir} - ;; -*) - # Use /boot/grub by default. - bootdir=${rootdir}/boot - ;; -esac - -grubdir=${bootdir}/`echo grub | sed ${transform}` +grubdir=${rootdir}${defaultbootdir} $grub_editenv ${grubdir}/grubenv unset prev_saved_entry $grub_editenv ${grubdir}/grubenv set saved_entry="$entry" === modified file 'util/grub.d/00_header.in' --- util/grub.d/00_header.in 2010-06-02 12:57:13 +0000 +++ util/grub.d/00_header.in 2010-06-03 21:36:19 +0000 @@ -20,12 +20,12 @@ transform="@program_transform_name@" address@hidden@ address@hidden@ address@hidden@ -grub_prefix=`echo /boot/grub | sed ${transform}` -locale_dir=`echo /boot/grub/locale | sed ${transform}` address@hidden@ + +locale_dir=${GRUB_DIR}/locale grub_lang=`echo $LANG | cut -d _ -f 1` -. ${libdir}/grub/grub-mkconfig_lib +. ${pkglibrootdir}/grub-mkconfig_lib # Do this as early as possible, since other commands might depend on it. # (e.g. the `loadfont' command might need lvm or raid modules) @@ -89,7 +89,7 @@ for x in ${GRUB_TERMINAL_INPUT} ${GRUB_T done if [ "x$serial" = x1 ]; then - if ! test -e ${grub_prefix}/serial.mod ; then + if ! test -e ${GRUB_DIR}/serial.mod ; then echo "Serial terminal not available on this platform." >&2 ; exit 1 fi === modified file 'util/grub.d/10_hurd.in' --- util/grub.d/10_hurd.in 2010-05-18 18:10:37 +0000 +++ util/grub.d/10_hurd.in 2010-06-03 21:36:19 +0000 @@ -18,8 +18,9 @@ address@hidden@ address@hidden@ address@hidden@ -. ${libdir}/grub/grub-mkconfig_lib address@hidden@ + +. ${pkglibrootdir}/grub-mkconfig_lib CLASS="--class gnu --class os" === modified file 'util/grub.d/10_kfreebsd.in' --- util/grub.d/10_kfreebsd.in 2010-04-14 12:59:58 +0000 +++ util/grub.d/10_kfreebsd.in 2010-06-03 21:36:19 +0000 @@ -19,8 +19,9 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -. ${libdir}/grub/grub-mkconfig_lib address@hidden@ + +. ${pkglibrootdir}/grub-mkconfig_lib export address@hidden@ export address@hidden@ === modified file 'util/grub.d/10_linux.in' --- util/grub.d/10_linux.in 2010-04-14 12:59:58 +0000 +++ util/grub.d/10_linux.in 2010-06-03 21:36:19 +0000 @@ -19,8 +19,9 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -. ${libdir}/grub/grub-mkconfig_lib address@hidden@ + +. ${pkglibrootdir}/grub-mkconfig_lib export address@hidden@ export address@hidden@ === modified file 'util/grub.d/10_netbsd.in' --- util/grub.d/10_netbsd.in 2010-04-19 19:25:41 +0000 +++ util/grub.d/10_netbsd.in 2010-06-03 21:36:19 +0000 @@ -19,8 +19,9 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -. ${libdir}/grub/grub-mkconfig_lib address@hidden@ + +. ${pkglibrootdir}/grub-mkconfig_lib export address@hidden@ export address@hidden@ === modified file 'util/grub.d/10_windows.in' --- util/grub.d/10_windows.in 2010-05-18 19:58:49 +0000 +++ util/grub.d/10_windows.in 2010-06-03 21:36:19 +0000 @@ -18,8 +18,9 @@ address@hidden@ address@hidden@ address@hidden@ -. ${libdir}/grub/grub-mkconfig_lib address@hidden@ + +. ${pkglibrootdir}/grub-mkconfig_lib case "`uname 2>/dev/null`" in CYGWIN*) ;; === modified file 'util/grub.d/30_os-prober.in' --- util/grub.d/30_os-prober.in 2010-02-03 00:24:07 +0000 +++ util/grub.d/30_os-prober.in 2010-06-03 21:36:19 +0000 @@ -18,9 +18,9 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -. ${libdir}/grub/grub-mkconfig_lib +. ${pkglibrootdir}/grub-mkconfig_lib if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then exit 0 === modified file 'util/i386/efi/grub-install.in' --- util/i386/efi/grub-install.in 2010-06-03 20:34:49 +0000 +++ util/i386/efi/grub-install.in 2010-06-03 21:36:19 +0000 @@ -29,9 +29,10 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` address@hidden@ +pkglibdir=${pkglibrootdir}/${target_cpu}-${platform} address@hidden@/locale address@hidden@ self=`basename $0` @@ -40,7 +41,6 @@ grub_mkdevicemap=${sbindir}/`echo grub-m grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= -grub_prefix=`echo /boot/grub | sed ${transform}` modules= no_floppy= @@ -66,7 +66,7 @@ Install GRUB on your EFI partition. --no-floppy do not probe any floppy drive --recheck probe a device map even if it already exists -$self copies GRUB images into the DIR/boot directory specified by +$self copies GRUB images into the DIR${defaultbootdir} directory specified by --root-directory. Report bugs to . @@ -113,20 +113,7 @@ if test $debug = yes; then fi # Initialize these directories here, since ROOTDIR was initialized. -case "$host_os" in -netbsd* | openbsd*) - # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub - # instead of /boot/grub. - grub_prefix=`echo /grub | sed ${transform}` - bootdir=${rootdir} - ;; -*) - # Use /boot/grub by default. - bootdir=${rootdir}/boot - ;; -esac - -grubdir=${bootdir}/`echo grub | sed ${transform}` +grubdir=${rootdir}${defaultbootdir} device_map=${grubdir}/device.map # Check if GRUB is installed. === modified file 'util/ieee1275/grub-install.in' --- util/ieee1275/grub-install.in 2010-06-03 20:34:49 +0000 +++ util/ieee1275/grub-install.in 2010-06-03 21:36:19 +0000 @@ -32,7 +32,9 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` address@hidden@ +pkglibdir=${pkglibrootdir}/${target_cpu}-${platform} address@hidden@ self=`basename $0` @@ -41,7 +43,6 @@ grub_mkdevicemap=${sbindir}/`echo grub-m grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= -grub_prefix=`echo /boot/grub | sed ${transform}` modules= install_device= @@ -68,7 +69,7 @@ Install GRUB on your drive. --grub-probe=FILE use FILE as grub-probe --no-nvram don't update the boot-device NVRAM variable -$self copies GRUB images into the DIR/boot directory specified by +$self copies GRUB images into the DIR${defaultbootdir} directory specified by --root-directory, and uses nvsetenv to set the Open Firmware boot-device variable. @@ -121,8 +122,7 @@ if test $debug = yes; then fi # Initialize these directories here, since ROOTDIR was initialized. -bootdir=${rootdir}/boot -grubdir=${bootdir}/`echo grub | sed ${transform}` +grubdir=${rootdir}${defaultbootdir} device_map=${grubdir}/device.map set $grub_mkimage dummy @@ -136,7 +136,7 @@ fi # Find the partition at the right mount point. install_device=`$grub_mkdevicemap --device-map=/dev/stdout | $grub_probe --target=device --device-map=/dev/stdin ${grubdir}` -if test "x$install_device" = "x`$grub_mkdevicemap --device-map=/dev/stdout | $grub_probe --target=device --device-map=/dev/stdin ${bootdir}`"; then +if test "x$install_device" = "x`$grub_mkdevicemap --device-map=/dev/stdout | $grub_probe --target=device --device-map=/dev/stdin ${grubdir}/..`"; then echo "$grubdir must be a mount point." exit 1 fi === modified file 'util/powerpc/ieee1275/grub-mkrescue.in' --- util/powerpc/ieee1275/grub-mkrescue.in 2010-06-03 20:34:49 +0000 +++ util/powerpc/ieee1275/grub-mkrescue.in 2010-06-03 21:36:19 +0000 @@ -28,7 +28,8 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` address@hidden@ +pkglibdir=${pkglibrootdir}/${target_cpu}-${platform} self=`basename $0` === modified file 'util/update-grub_lib.in' --- util/update-grub_lib.in 2008-11-20 19:22:20 +0000 +++ util/update-grub_lib.in 2010-06-03 21:36:19 +0000 @@ -16,8 +16,8 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ -. ${libdir}/grub/grub-mkconfig_lib +. ${pkglibrootdir}/grub-mkconfig_lib grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"