On 06/04/2010 01:42 AM, Grégoire Sutre wrote: > +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 > /boot isn't transformed + # 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 Should have been ${grubdir}/grub.elf + # 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 Same. +# 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 This would be a separate patch and the problem is that scripts assume that currently loaded kernel is the kernel which will be loaded or similar (look e.g. at uuid check). This would be a separate patch. + file-name-transformations_3.diff go ahead for trunk file-name-transformations_4.diff go ahead for trunk file-name-transformations_5.diff Transforming names in manual may be cumbersome and conflicts with Colin's patch. file-name-transformations_6.diff: - $(INSTALL_DATA) $$dir$$file $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ + dest="`echo $(PACKAGE).mo | sed 's,.*/,,' | sed '$(transform)'`"; \ + $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(datadir)/locale/$$lang/LC_MESSAGES/$$dest; \ Why don't you transform locale and LC_MESSAGES? file-name-transformations_7.dif Go ahead for trunk -- Regards Vladimir 'φ-coder/phcoder' Serbinenko