[1983] 2009-02-08 Robert Millan <address@hidden>

[Robert Millan]

Revision: 1983
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1983
Author:   robertmh
Date:     2009-02-08 19:59:32 +0000 (Sun, 08 Feb 2009)

Log Message:
-----------
2009-02-08  Robert Millan  <address@hidden>

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/Makefile.in
    trunk/grub2/conf/common.mk
    trunk/grub2/conf/common.rmk
    trunk/grub2/configure
    trunk/grub2/configure.ac

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-02-08 17:58:32 UTC (rev 1982)
+++ trunk/grub2/ChangeLog       2009-02-08 19:59:32 UTC (rev 1983)
@@ -1,3 +1,8 @@
+2009-02-08  Robert Millan  <address@hidden>
+
+       * Makefile.in (host_os, host_cpu): New variables.
+       (target_os): Remove.  Update all users.
+
 2009-02-08  Marco Gerards  <address@hidden>
 
        * Makefile.in (enable_grub_emu_usb): New variable.

Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in     2009-02-08 17:58:32 UTC (rev 1982)
+++ trunk/grub2/Makefile.in     2009-02-08 19:59:32 UTC (rev 1983)
@@ -47,8 +47,10 @@
 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@

Modified: trunk/grub2/conf/common.mk
===================================================================
--- trunk/grub2/conf/common.mk  2009-02-08 17:58:32 UTC (rev 1982)
+++ trunk/grub2/conf/common.mk  2009-02-08 19:59:32 UTC (rev 1983)
@@ -579,7 +579,7 @@
        ./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
 

Modified: trunk/grub2/conf/common.rmk
===================================================================
--- trunk/grub2/conf/common.rmk 2009-02-08 17:58:32 UTC (rev 1982)
+++ trunk/grub2/conf/common.rmk 2009-02-08 19:59:32 UTC (rev 1983)
@@ -146,7 +146,7 @@
        ./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
 

Modified: trunk/grub2/configure
===================================================================
--- trunk/grub2/configure       2009-02-08 17:58:32 UTC (rev 1982)
+++ trunk/grub2/configure       2009-02-08 19:59:32 UTC (rev 1983)
@@ -2006,14 +2006,12 @@
   mingw32) host_os=cygwin ;;
 esac
 
-case "$target_os" in
-  mingw32) target_os=cygwin ;;
-esac
 
 
 
 
 
+
 #
 # Checks for build programs.
 #
@@ -5906,10 +5904,10 @@
 # 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 @@
 # 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
 

Modified: trunk/grub2/configure.ac
===================================================================
--- trunk/grub2/configure.ac    2009-02-08 17:58:32 UTC (rev 1982)
+++ trunk/grub2/configure.ac    2009-02-08 19:59:32 UTC (rev 1983)
@@ -103,12 +103,10 @@
   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 @@
 
 # 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 @@
 
 # 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)