vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't transform PACKAGE_TARNAME following a discussion on autoconf

Browse source 
mailing list.

	* util/grub-install.in: Don't transform PACKAGE_TARNAME.
	* util/grub-kbdcomp.in: Likewise.
	* util/grub-mkconfig.in: Likewise.
	* util/grub-mkconfig_lib.in: Likewise.
	* util/grub-mknetdir.in: Likewise.
	* util/grub-mkrescue.in: Likewise.
	* util/grub-mkstandalone.in: Likewise.
	* util/grub-reboot.in: Likewise.
	* util/grub-set-default.in: Likewise.
	* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 18:37:54 +01:00
parent 47454da510
commit fc847818fc
11 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/grub-mkstandalone.in
View file

@ -32,7 +32,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
fi
self=`basename $0`
@ -58,7 +58,7 @@ usage () {
printf " -v, --version %s\n" "$(gettext "print the version information and exit")"
printf " -o, --output=%-11s%s\n" "$(gettext FILE)" "$(gettext "save output in FILE [required]")"
# TRANSLATORS: platform here isn't identifier. It can be translated.
dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/<platform>]" "${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})")"
dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/<platform>]" "${libdir}/${PACKAGE_TARNAME}")"
printf " -d, --directory=%-8s%s\n" \
"DIR" "$dir_msg"
printf " -O, --format=%-11s%s" "$(gettext "FORMAT")" "$(gettext "generate an image in format")"; echo
@ -155,7 +155,7 @@ if [ "x$source_directory" = x ] ; then
mips-loongson)
cpu=mipsel ;;
esac
source_directory="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/$cpu-$platform"
source_directory="${libdir}/${PACKAGE_TARNAME}/$cpu-$platform"
fi
. "${source_directory}"/modinfo.sh