Handle newer autotools. Add some missing quotes while on it.

	* Makefile.am (pkglib_DATA): Remove update-grub_lib.
	(pkglib_DATA): Move grub-mkconfig_lib from here ...
	(pkgdata_DATA): ... here.
	* Makefile.util.def (update-grub_lib): Removed.
	* conf/Makefile.common (pkglib_DATA): Removed.
	(pkglib_SCRIPTS): Likewise.
	(pkgdata_DATA): New variable.
	* tests/util/grub-shell-tester.in: Replace pkglib with pkgdata where
	needed.
	Add missing quotes.
	Remove unused variable while on it.
	* tests/util/grub-shell.in: Likewise.
	* util/grub-install.in: Likewise.
	* util/grub-mkconfig.in: Likewise.
	* util/grub-mknetdir.in: Likewise.
	* util/grub-mkrescue.in: Likewise.
	* util/grub-mkstandalone.in: Likewise.
	* util/grub.d/00_header.in: Likewise.
	* util/grub.d/10_hurd.in: Likewise.
	* util/grub.d/10_illumos.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/20_linux_xen.in: Likewise.
	* util/grub.d/30_os-prober.in: Likewise.
	* util/update-grub_lib.in: Removed.

diff --git a/ChangeLog b/ChangeLog
index 1f575d15bd97ada68fcb361ae5fdd96ef9810af6..79124720bb2a80eb5b35bd0635a5f71be1d9042d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,36 @@
-2012-01-14  Seth Goldberg <seth.goldberg@oracle.com>
+2012-01-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Handle newer autotools. Add some missing quotes while on it.
+
+       * Makefile.am (pkglib_DATA): Remove update-grub_lib.
+       (pkglib_DATA): Move grub-mkconfig_lib from here ...
+       (pkgdata_DATA): ... here.
+       * Makefile.util.def (update-grub_lib): Removed.
+       * conf/Makefile.common (pkglib_DATA): Removed.
+       (pkglib_SCRIPTS): Likewise.
+       (pkgdata_DATA): New variable.
+       * tests/util/grub-shell-tester.in: Replace pkglib with pkgdata where
+       needed.
+       Add missing quotes.
+       Remove unused variable while on it.
+       * tests/util/grub-shell.in: Likewise.
+       * util/grub-install.in: Likewise.
+       * util/grub-mkconfig.in: Likewise.
+       * util/grub-mknetdir.in: Likewise.
+       * util/grub-mkrescue.in: Likewise.
+       * util/grub-mkstandalone.in: Likewise.
+       * util/grub.d/00_header.in: Likewise.
+       * util/grub.d/10_hurd.in: Likewise.
+       * util/grub.d/10_illumos.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/20_linux_xen.in: Likewise.
+       * util/grub.d/30_os-prober.in: Likewise.
+       * util/update-grub_lib.in: Removed.
+
+2012-01-24  Seth Goldberg <seth.goldberg@oracle.com>
 
        * grub-core/net/drivers/i386/pc/pxe.c (grub_pxe_recv): Relax checks as
        a workaround for intel problem.

diff --git a/Makefile.am b/Makefile.am
index c5f486e0d52529730b82a6a956550b7e79684247..99b141e07ca0d7c32b7e97ad06fc4342b2055b45 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,8 +101,7 @@ CLEANFILES += widthspec.h
 # Install config.h into platformdir
 platform_HEADERS = config.h
 
-pkglib_DATA += grub-mkconfig_lib
-pkglib_DATA += update-grub_lib
+pkgdata_DATA += grub-mkconfig_lib
 
 
 if COND_i386_coreboot

diff --git a/Makefile.util.def b/Makefile.util.def
index d12d529a6594a07fa3474f62ddea5cdd34d19cc1..c865870be157dd3a767e43c63b041917a78f99f0 100644 (file)
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -498,12 +498,6 @@ script = {
   installdir = noinst;
 };
 
-script = {
-  name = update-grub_lib;
-  common = util/update-grub_lib.in;
-  installdir = noinst;
-};
-
 script = {
   name = grub-kbdcomp;
   common = util/grub-kbdcomp.in;

diff --git a/conf/Makefile.common b/conf/Makefile.common
index 751188b26160c528ec8b4769fc5e260ea37bfb79..ed84e76d8679e05cb30442606f0a3996d4d98490 100644 (file)
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
 
 man_MANS =
 noinst_DATA =
-pkglib_DATA =
+pkgdata_DATA =
 bin_SCRIPTS =
 sbin_SCRIPTS =
 bin_PROGRAMS =
@@ -147,7 +147,6 @@ check_SCRIPTS =
 grubconf_DATA =
 check_PROGRAMS =
 noinst_SCRIPTS =
-pkglib_SCRIPTS =
 noinst_PROGRAMS =
 grubconf_SCRIPTS =
 noinst_LIBRARIES =

diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
index 04d0ad5d9c21130d0bab145292035867aa5d25bf..80c8830766313a9fdac0fe94e55cb62318a12c1e 100644 (file)
--- a/tests/util/grub-shell-tester.in
+++ b/tests/util/grub-shell-tester.in
@@ -20,17 +20,16 @@ set -e
 # Initialize some variables.
 transform="@program_transform_name@"
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-builddir=@builddir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+builddir="@builddir@"
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 
 # Force build directory components
-PATH=${builddir}:$PATH
+PATH="${builddir}:$PATH"
 export PATH
 
 # Usage: usage
@@ -85,23 +84,23 @@ done
 if [ "x${source}" = x ] ; then
   tmpfile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
   while read REPLY; do
-    echo $REPLY >> ${tmpfile}
+    echo $REPLY >> "${tmpfile}"
   done
-  source=${tmpfile}
+  source="${tmpfile}"
 fi
 
 outfile1=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
-@builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1}
+"@builddir@/grub-shell" --qemu-opts="${qemuopts}" --modules=${modules} "${source}" >"${outfile1}"
 
 outfile2=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
-bash ${source} >${outfile2}
+bash "${source}" >"${outfile2}"
 
-if ! diff -q ${outfile1} ${outfile2} >/dev/null
+if ! diff -q "${outfile1}" "${outfile2}" >/dev/null
 then
   echo "${source}: GRUB and BASH outputs did not match (see diff -u ${outfile1} ${outfile2})"
   status=1
 else
-    rm -f ${outfile1} ${outfile2}
+    rm -f "${outfile1}" "${outfile2}"
 fi
 
 exit $status

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 77853217f584c6fbf1a244e34bdfc807375e2290..abb3bff1f89489c09113600a589d9a112896085b 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -20,11 +20,10 @@ set -e
 # Initialize some variables.
 transform="@program_transform_name@"
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-builddir=@builddir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+builddir="@builddir@"
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
@@ -32,7 +31,7 @@ target_cpu=@target_cpu@
 platform=@platform@
 
 # Force build directory components
-PATH=${builddir}:$PATH
+PATH="${builddir}:$PATH"
 export PATH
 
 # Usage: usage
@@ -141,9 +140,9 @@ EOF
 
 isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
 if [ x$boot != xnet ]; then
-    sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} --override-directory=${builddir}/grub-core \
+    sh "@builddir@/grub-mkrescue" "--grub-mkimage=${builddir}/grub-mkimage" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \
        --rom-directory="${rom_directory}" \
-       /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
+       "/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \
        ${files} >/dev/null 2>&1
 fi
 if [ x$boot = xhd ]; then
@@ -174,12 +173,12 @@ fi
 
 if [ x$boot = xnet ]; then
     netdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
-    sh @builddir@/grub-mknetdir --grub-mkimage=${builddir}/grub-mkimage --override-directory=${builddir}/grub-core --net-directory=$netdir
-    cp ${cfgfile} $netdir/boot/grub/grub.cfg
-    cp ${source} $netdir/boot/grub/testcase.cfg
-    ${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -boot n -net user,tftp=$netdir,bootfile=/boot/grub/$target_cpu-$platform/core.0  -net nic  | cat | tr -d "\r"
+    sh "@builddir@/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--override-directory=${builddir}/grub-core" "--net-directory=$netdir"
+    cp "${cfgfile}" "$netdir/boot/grub/grub.cfg"
+    cp "${source}" "$netdir/boot/grub/testcase.cfg"
+    "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/$target_cpu-$platform/core.0"  -net nic  | cat | tr -d "\r"
 else
-    ${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
+    "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
 fi
 rm -f "${isofile}" "${imgfile}"
 rm -rf "${rom_directory}"

diff --git a/util/grub-install.in b/util/grub-install.in
index 96b1dfe76c36f82f255338037561fce19dc92495..899e67a07dbc36f1bfcc0743f135ffd7c3ac86e1 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -21,6 +21,7 @@ transform="@program_transform_name@"
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
 sbindir="@sbindir@"
 bindir="@bindir@"
 libdir="@libdir@"
@@ -31,8 +32,8 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 platform=@platform@
 host_os=@host_os@
-datarootdir=@datarootdir@
 pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`"
+datadir="@datadir@"
 localedir="@datadir@/locale"
 
 self="`basename $0`"
@@ -264,7 +265,7 @@ do
     esac
 done
 
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
 
 if test "x$install_device" = x && ([ "${target_cpu}-${platform}" = "i386-pc" ] \
     || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]); then

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index c408ccc1a38dbf830e227adc2246bc6a2b285295..c7175586d1062e03fed6143107a3c7c5216317f1 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -18,25 +18,26 @@ set -e
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
 transform="@program_transform_name@"
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-bindir=@bindir@
-libdir=@libdir@
-sysconfdir=@sysconfdir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+sbindir="@sbindir@"
+bindir="@bindir@"
+sysconfdir="@sysconfdir@"
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 host_os=@host_os@
-datarootdir=@datarootdir@
-datadir=@datadir@
-pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
+datadir="@datadir@"
+pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
 grub_cfg=""
-grub_mkconfig_dir=${sysconfdir}/grub.d
+grub_mkconfig_dir="${sysconfdir}"/grub.d
 
 self=`basename $0`
 
-grub_probe=${sbindir}/`echo grub-probe | sed "${transform}"`
+grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"
 grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
 
 GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
@@ -94,7 +95,7 @@ do
     esac
 done
 
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
 
 if [ "x$EUID" = "x" ] ; then
   EUID=`id -u`

diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
index e5a2172fda46d6b36978c765576ca8f1edc89f31..4f4061621db0129a144e3ca316df66efc38e6815 100644 (file)
--- a/util/grub-mknetdir.in
+++ b/util/grub-mknetdir.in
@@ -19,22 +19,20 @@
 # Initialize some variables.
 transform="@program_transform_name@"
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-bindir=@bindir@
-libdir=@libdir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+bindir="@bindir@"
+libdir="@libdir@"
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 host_os=@host_os@
-localedir=@datadir@/locale
-datarootdir=@datarootdir@
 pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 
 self=`basename $0`
 
-grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
+grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
 rootdir=/srv/tftp
 grub_prefix=`echo /boot/grub | sed ${transform}`
 modules=
@@ -45,13 +43,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}/$(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"
 
 # Usage: usage
 # Print the usage.
@@ -173,12 +171,12 @@ process_input_dir ()
     config_opt=
     mkdir -p "$grubdir" || exit 1
 
-    for file in ${grubdir}/*.mod ${grubdir}/*.lst ${grubdir}/*.img ${grubdir}/efiemu??.o; do
-       if test -f $file && [ "`basename $file`" != menu.lst ]; then
-           rm -f $file || exit 1
+    for file in "${grubdir}"/*.mod "${grubdir}"/*.lst "${grubdir}"/*.img "${grubdir}"/efiemu??.o; do
+       if test -f "$file" && [ "`basename $file`" != menu.lst ]; then
+           rm -f "$file" || exit 1
        fi
     done
-    for file in ${input_dir}/*.mod; do
+    for file in "${input_dir}"/*.mod; do
         if test -f "$file"; then
             cp -f "$file" "$grubdir/"
         fi
@@ -225,7 +223,7 @@ process_input_dir ()
 source ${subdir}/grub.cfg
 EOF
 
-    $grub_mkimage ${config_opt} -d "${input_dir}" -O ${mkimage_target} --output=${grubdir}/core.$ext --prefix=$prefix $modules $netmodules tftp || exit 1
+    "$grub_mkimage" ${config_opt} -d "${input_dir}" -O ${mkimage_target} "--output=${grubdir}/core.$ext" "--prefix=$prefix" $modules $netmodules tftp || exit 1
     echo "Netboot directory for ${platform} created. Configure your DHCP server to point to ${subdir}/${platform}/core.$ext"
 }
 

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index eff77088f2c286b562eb95fe2f747c8f54de6dbd..ccad5e0d93a1c147f344f0992ef1b2027f4be2a7 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -18,12 +18,14 @@ set -e
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
 # Initialize some variables.
+
 transform="@program_transform_name@"
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+bindir="@bindir@"
+libdir="@libdir@"
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@

diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
index b0dbf9b0e24fad2127a9299813eecc2ff55bec6d..13cf9df7ba1a79c1ff5d698c069c71a6778904c8 100644 (file)
--- a/util/grub-mkstandalone.in
+++ b/util/grub-mkstandalone.in
@@ -18,12 +18,14 @@ set -e
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
 # Initialize some variables.
+
 transform="@program_transform_name@"
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+bindir="@bindir@"
+libdir="@libdir@"
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
@@ -34,7 +36,7 @@ self=`basename $0`
 source_directory=
 compression=auto
 format=
-grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
+grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
 source=
 
 # Usage: usage
@@ -184,7 +186,7 @@ memdisk_img=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
 
 (cd "${memdisk_dir}"; tar -cf - * $source) > "${memdisk_img}"
 rm -rf "${memdisk_dir}"
-$grub_mkimage -O "${format}" -C "$compression" -d "${source_directory}" -m "${memdisk_img}" -o "$output_image" --prefix='(memdisk)/boot/grub' memdisk tar $modules
+"$grub_mkimage" -O "${format}" -C "$compression" -d "${source_directory}" -m "${memdisk_img}" -o "$output_image" --prefix='(memdisk)/boot/grub' memdisk tar $modules
 rm -rf "${memdisk_img}"
 
 exit 0

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 54012f854814d1900836c2c992a02849d8cf9ef6..ece1b90da43744ba54b100d6ce0d58f4a0a5caf0 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -19,13 +19,13 @@ set -e
 
 transform="@program_transform_name@"
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
 locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
 grub_lang=`echo $LANG | cut -d . -f 1`
 
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+. "@datadir@/@PACKAGE@/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)
@@ -112,7 +112,7 @@ for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
 done
 
 if [ "x$serial" = x1 ]; then
-    if ! test -e ${GRUB_PREFIX}/serial.mod ; then
+    if ! test -e "${GRUB_PREFIX}/serial.mod" ; then
        echo "Serial terminal not available on this platform." >&2 ; exit 1
     fi
 

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index d04b0a4fe98ec54b1ef5420ead7ba9395318fbe7..c885eaba69f266e0aedbbfec376bc0b839b1d33a 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -17,11 +17,10 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-datarootdir=@datarootdir@
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
 CLASS="--class gnu --class os"
 

diff --git a/util/grub.d/10_illumos.in b/util/grub.d/10_illumos.in
index 2b87dfa4f00d4d1e05bdffe07b14ae4bcca5cf96..a4be7ba14abd3a944e9f488d962c08de16b37a3e 100644 (file)
--- a/util/grub.d/10_illumos.in
+++ b/util/grub.d/10_illumos.in
@@ -17,15 +17,13 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-datarootdir=@datarootdir@
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
-export TEXTDOMAINDIR=@localedir@
+export TEXTDOMAINDIR="@localedir@"
 
 CLASS="--class os"
 

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index a1b86b82b15cb111fb115603265c978c2c750421..dede4f6dae494097d4bb7aa4a87f4d5d2bdee5bc 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -17,15 +17,13 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-datarootdir=@datarootdir@
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
-export TEXTDOMAINDIR=@localedir@
+export TEXTDOMAINDIR="@localedir@"
 
 CLASS="--class os"
 

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index fe4f0e730c7a3269d9df416d04e99fbd201b7603..d5586b375a4e567e0e9e3898ed1e8418b2bd0062 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -17,15 +17,14 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-datarootdir=@datarootdir@
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
-export TEXTDOMAINDIR=@localedir@
+export TEXTDOMAINDIR="@localedir@"
 
 CLASS="--class gnu-linux --class gnu --class os"
 

diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
index 8c232b01b01c199a8037bc4d05f43f55ada6be3a..df095ddc074b9d6504fc196f641e6f944e07c4f3 100644 (file)
--- a/util/grub.d/10_netbsd.in
+++ b/util/grub.d/10_netbsd.in
@@ -17,15 +17,13 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-datarootdir=@datarootdir@
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
-export TEXTDOMAINDIR=@localedir@
+export TEXTDOMAINDIR="@localedir@"
 
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS="NetBSD"

diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in
index 20fd4e044a3c80ae39db0adbc04629a0d218ef1f..8ee75d261dccde81d2214965b06fc306b96efb87 100644 (file)
--- a/util/grub.d/10_windows.in
+++ b/util/grub.d/10_windows.in
@@ -17,11 +17,11 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-datarootdir=@datarootdir@
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
 case "`uname 2>/dev/null`" in
   CYGWIN*)  ;;

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 2f1b4af886e19e698dc6cda56c7d109ade65b417..ab6319feb3f4f0b00f98835dd881c0996ff274e6 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -17,15 +17,14 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-datarootdir=@datarootdir@
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
 export TEXTDOMAIN=@PACKAGE@
-export TEXTDOMAINDIR=@localedir@
+export TEXTDOMAINDIR="@localedir@"
 
 CLASS="--class gnu-linux --class gnu --class os --class xen"
 

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index e6e19cef34a574f6f9eb838b98f9f4031811a356..5f451524017c8cae388947b203b832bef8434af1 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -17,11 +17,11 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
 
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
 if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
   exit 0

diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
deleted file mode 100644 (file)
index 430ce13..0000000
--- a/util/update-grub_lib.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# stub for new grub-mkconfig_lib
-# Copyright (C) 2007,2008  Free Software Foundation, Inc.
-#
-# GRUB is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GRUB is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
-
-grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"