Don't transform PACKAGE_TARNAME following a discussion on autoconf

	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.

diff --git a/ChangeLog b/ChangeLog
index 824a79636647db2c29d5d338723b8ae86e059f5d..f1d7924d8926a3af132214f42e89abb79800280e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-02-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Don't transform PACKAGE_TARNAME following a discussion on autoconf
+       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.
+
 2012-02-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Remove GRUB_PREFIX.

diff --git a/util/grub-install.in b/util/grub-install.in
index a62d42b0b0b0934f366d0f1f1d6eeac4a43a6278..caa9ac8f591ad46d747cccb2cc2ec6e3982732c2 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -32,10 +32,10 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 platform=@platform@
 host_os=@host_os@
-pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`"
+pkglibdir="${libdir}/${PACKAGE_TARNAME}/${target_cpu}-${platform}"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
+    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
 fi
 localedir="@datadir@/locale"
 

diff --git a/util/grub-kbdcomp.in b/util/grub-kbdcomp.in
index 39387344397d7ecbcc2eeb48e33bbf994d8e8fc5..87c0100b6d2604830a131622cd7e8e7d6886f909 100644 (file)
--- a/util/grub-kbdcomp.in
+++ b/util/grub-kbdcomp.in
@@ -8,7 +8,7 @@ bindir="@bindir@"
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
+    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
 fi
 
 grub_mklayout="${bindir}/`echo grub-mklayout | sed ${transform}`"

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 2e986b3988718ff441fed5ee1d2eb2adaa4b90f0..ecccf3b58cf222698595a3355dc0e7c37a7616ca 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -32,7 +32,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 host_os=@host_os@
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
+    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
 fi
 grub_cfg=""
 grub_mkconfig_dir="${sysconfdir}"/grub.d

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index a32a2b2bb8234f1358d06adecdcc8c56e0f89a6b..ef0cf6c35580b38a68ca88b0c008b2cb7b3bc349 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -22,7 +22,7 @@ datarootdir="@datarootdir@"
 datadir="@datadir@"
 bindir="@bindir@"
 sbindir="@sbindir@"
-pkgdatadir="${datadir}/`echo "@PACKAGE_TARNAME@" | sed "${transform}"`"
+pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
 
 if test "x$grub_probe" = x; then
   grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"

diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
index 67b258dd8906a6d5234a1aa12d622f2cc87710db..7db6c45120e5d6918bb796b2a37a0645ba7294da 100644 (file)
--- a/util/grub-mknetdir.in
+++ b/util/grub-mknetdir.in
@@ -31,7 +31,7 @@ host_os=@host_os@
 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`
@@ -46,13 +46,13 @@ recheck=no
 debug=no
 debug_image=
 subdir=`echo /boot/grub | sed ${transform}`
-pc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc"
-ppc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/powerpc-ieee1275"
-sparc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/sparc64-ieee1275"
-i386_ieee1275_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-ieee1275"
-efi32_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi"
-efi64_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi"
-itanium_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/ia64-efi"
+pc_dir="${libdir}/${PACKAGE_TARNAME}/i386-pc"
+ppc_dir="${libdir}/${PACKAGE_TARNAME}/powerpc-ieee1275"
+sparc_dir="${libdir}/${PACKAGE_TARNAME}/sparc64-ieee1275"
+i386_ieee1275_dir="${libdir}/${PACKAGE_TARNAME}/i386-ieee1275"
+efi32_dir="${libdir}/${PACKAGE_TARNAME}/i386-efi"
+efi64_dir="${libdir}/${PACKAGE_TARNAME}/x86_64-efi"
+itanium_dir="${libdir}/${PACKAGE_TARNAME}/ia64-efi"
 
 . "${pkgdatadir}/grub-mkconfig_lib"
 

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 320873025e34ef58fd3d18ca9cff77981897c058..6221e60d6216646d5901ec1e005980a7a66e350f 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -31,18 +31,18 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
+    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
 fi
 pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 
 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="${libdir}/${PACKAGE_TARNAME}/i386-multiboot"
+coreboot_dir="${libdir}/${PACKAGE_TARNAME}/i386-coreboot"
+qemu_dir="${libdir}/${PACKAGE_TARNAME}/i386-qemu"
+pc_dir="${libdir}/${PACKAGE_TARNAME}/i386-pc"
+efi32_dir="${libdir}/${PACKAGE_TARNAME}/i386-efi"
+efi64_dir="${libdir}/${PACKAGE_TARNAME}/x86_64-efi"
 rom_directory=
 override_dir=
 grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"

diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
index adcaba61ae2112c7539556d3824e32b67abc981c..2adf5b7269c27faec646c2f79f48a9eb1b9abd7d 100644 (file)
--- a/util/grub-mkstandalone.in
+++ b/util/grub-mkstandalone.in
@@ -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

diff --git a/util/grub-reboot.in b/util/grub-reboot.in
index a55ba5ab15c131943f9578179af91897f989c797..9a04cb8b04d11fb3a3d7761e05a44d1b7db517aa 100644 (file)
--- a/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@ -27,7 +27,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
+    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
 fi
 
 self=`basename $0`

diff --git a/util/grub-set-default.in b/util/grub-set-default.in
index bc9a1c3bbec2fea2802f25b887747cc48b04f676..9429d3c91164aab1564e4258d7efe8b0f4074495 100644 (file)
--- a/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@ -27,7 +27,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
+    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
 fi
 
 self=`basename $0`

diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index e9f825d2fbd6060d8f21a80e77085679745bf6d5..02edf8d559c81bd02c25c413c54eeb8a8a5f885a 100644 (file)
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -29,11 +29,11 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 platform=@platform@
-pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+pkglibdir="${libdir}/${PACKAGE_TARNAME}/${target_cpu}-${platform}"
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
+    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
 fi
 
 self=`basename $0`