2009-02-08 Robert Millan <rmh@aybabtu.com>

        * Makefile.in (host_os, host_cpu): New variables.
        (target_os): Remove.  Update all users.

diff --git a/ChangeLog b/ChangeLog
index f806b40a3717d220e713fd85961578d6a61db169..ecf7b8338595bc7e757197be6ddca87f58aa97c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-08  Robert Millan  <rmh@aybabtu.com>
+
+       * Makefile.in (host_os, host_cpu): New variables.
+       (target_os): Remove.  Update all users.
+
 2009-02-08  Marco Gerards  <marco@gnu.org>
 
        * Makefile.in (enable_grub_emu_usb): New variable.

diff --git a/Makefile.in b/Makefile.in
index 398f928162b778fa49e3af3b3d50e8f927d9a038..44dc57795be9030679cc1f251c09c9f08de084eb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,8 +47,10 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+host_os = @host_os@
+host_cpu = @host_cpu@
+
 target_cpu = @target_cpu@
-target_os = @target_os@
 platform = @platform@
 
 INSTALL = @INSTALL@

diff --git a/conf/common.mk b/conf/common.mk
index e75c46b503351e29f11e44b81b7388cb9566004b..8053739e409a8a62226f935530800839cbf18145 100644 (file)
--- a/conf/common.mk
+++ b/conf/common.mk
@@ -579,7 +579,7 @@ CLEANFILES += update-grub_lib
        ./config.status --file=$@:$<
        chmod +x $@
 grub-mkconfig_SCRIPTS = 00_header 10_linux 10_hurd 10_freebsd 30_os-prober 40_custom
-ifeq ($(target_os), cygwin)
+ifeq ($(host_os), cygwin)
 grub-mkconfig_SCRIPTS += 10_windows
 endif
 

diff --git a/conf/common.rmk b/conf/common.rmk
index f91d6ff4e09b2bfca455ff99063dabe4e1ca4ccb..c7f97dd326445b7f7e6b47282afab2769e269541 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -146,7 +146,7 @@ CLEANFILES += update-grub_lib
        ./config.status --file=$@:$<
        chmod +x $@
 grub-mkconfig_SCRIPTS = 00_header 10_linux 10_hurd 10_freebsd 30_os-prober 40_custom
-ifeq ($(target_os), cygwin)
+ifeq ($(host_os), cygwin)
 grub-mkconfig_SCRIPTS += 10_windows
 endif
 

diff --git a/configure b/configure
index 74c400f63d6cb57088e05adfa3babb289abfbfe6..c82ee244d1e1bc9bc6883a161c489ea22dcf7253 100644 (file)
--- a/configure
+++ b/configure
@@ -2006,9 +2006,7 @@ case "$host_os" in
   mingw32) host_os=cygwin ;;
 esac
 
-case "$target_os" in
-  mingw32) target_os=cygwin ;;
-esac
+
 
 
 
@@ -5906,10 +5904,10 @@ done
 # Use linker script if present, otherwise use builtin -N script.
 { echo "$as_me:$LINENO: checking for option to link raw image" >&5
 echo $ECHO_N "checking for option to link raw image... $ECHO_C" >&6; }
-if test -f "${srcdir}/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc"; then
-  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc"
+if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
+  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
   TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc"
+  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
 else
   TARGET_IMG_LDSCRIPT=
   TARGET_IMG_LDFLAGS='-Wl,-N'
@@ -5923,8 +5921,8 @@ echo "${ECHO_T}$TARGET_IMG_LDFLAGS_AC" >&6; }
 # For platforms where ELF is not the default link format.
 { echo "$as_me:$LINENO: checking for command to convert module to ELF format" >&5
 echo $ECHO_N "checking for command to convert module to ELF format... $ECHO_C" >&6; }
-case "${host_os}:${target_os}" in
-  cygwin:cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
+case "${host_os}" in
+  cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
   *) ;;
 esac
 

diff --git a/configure.ac b/configure.ac
index 1df44960061b7faf0cc50122414f0fccd78582bb..7658c7a42122c948e743b9cb4906675091678b3f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -103,12 +103,10 @@ case "$host_os" in
   mingw32) host_os=cygwin ;;
 esac
 
-case "$target_os" in
-  mingw32) target_os=cygwin ;;
-esac
+AC_SUBST(host_cpu)
+AC_SUBST(host_os)
 
 AC_SUBST(target_cpu)
-AC_SUBST(target_os)
 AC_SUBST(platform)
 
 #
@@ -200,10 +198,10 @@ AC_CHECK_FUNCS(posix_memalign memalign asprintf)
 
 # Use linker script if present, otherwise use builtin -N script.
 AC_MSG_CHECKING([for option to link raw image])
-if test -f "${srcdir}/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc"; then
-  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc"
+if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
+  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
   TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc"
+  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
 else
   TARGET_IMG_LDSCRIPT=
   TARGET_IMG_LDFLAGS='-Wl,-N'
@@ -215,8 +213,8 @@ AC_MSG_RESULT([$TARGET_IMG_LDFLAGS_AC])
 
 # For platforms where ELF is not the default link format.
 AC_MSG_CHECKING([for command to convert module to ELF format])
-case "${host_os}:${target_os}" in
-  cygwin:cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
+case "${host_os}" in
+  cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
   *) ;;
 esac
 AC_SUBST(TARGET_OBJ2ELF)