[Cegcc-svn] SF.net SVN: cegcc: [1116] trunk/cegcc/src/w32api

[<ped...@us...>]

Revision: 1116
          http://cegcc.svn.sourceforge.net/cegcc/?rev=1116&view=rev
Author:   pedroalves
Date:     2007-12-25 15:12:07 -0800 (Tue, 25 Dec 2007)

Log Message:
-----------
	* configure.in (SUBDIRS): Set depending on $host_alias instead of
	on $host.
	* Makefile.in: Capture $build_alias, $host_alias, $target_alias
	verbatim from config.  Capture $build, $host, $target from config.
	Set $tooldir using $host_alias, not $target_alias.
	* libce/Makefile.in: Get $build, $build_alias, $host, $host_alias,
	$target and $target_alias from config.  Use $build, $host, $target
	instead of the aliases to detect a native build.  Use $host_alias
	instead of $target_alias to set the $tooldir.
	* configure: Regenerate.

Modified Paths:
--------------
    trunk/cegcc/src/w32api/ChangeLog.ce
    trunk/cegcc/src/w32api/Makefile.in
    trunk/cegcc/src/w32api/configure
    trunk/cegcc/src/w32api/configure.in
    trunk/cegcc/src/w32api/libce/Makefile.in

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2007-12-25 23:03:53 UTC (rev 1115)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2007-12-25 23:12:07 UTC (rev 1116)
@@ -1,5 +1,18 @@
 2007-12-25  Pedro Alves  <ped...@po...>
 
+	* configure.in (SUBDIRS): Set depending on $host_alias instead of
+	on $host.
+	* Makefile.in: Capture $build_alias, $host_alias, $target_alias
+	verbatim from config.  Capture $build, $host, $target from config.
+	Set $tooldir using $host_alias, not $target_alias.
+	* libce/Makefile.in: Get $build, $build_alias, $host, $host_alias,
+	$target and $target_alias from config.  Use $build, $host, $target
+	instead of the aliases to detect a native build.  Use $host_alias
+	instead of $target_alias to set the $tooldir.
+	* configure: Regenerate.
+
+2007-12-25  Pedro Alves  <ped...@po...>
+
 	* configure.in (SUBDIRS): Set depending on host, and pass it to
 	the Makefile.
 	* Makefile.in (SUBDIRS): Get from configure.

Modified: trunk/cegcc/src/w32api/Makefile.in
===================================================================
--- trunk/cegcc/src/w32api/Makefile.in	2007-12-25 23:03:53 UTC (rev 1115)
+++ trunk/cegcc/src/w32api/Makefile.in	2007-12-25 23:12:07 UTC (rev 1116)
@@ -16,9 +16,13 @@
 
 SUBDIRS = @SUBDIRS@
 
-build_alias = @build@
-host_alias = @host@
-target_alias = @target@
+build = @build@
+build_alias = @build_alias@
+host = @host@
+host_alias = @host_alias@
+target = @target@
+target_alias = @target_alias@
+
 with_cross_host = @with_cross_host@
 prefix = @prefix@
 conf_prefix = @prefix@
@@ -27,7 +31,7 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
+tooldir = $(exec_prefix)/$(host_alias)
 datadir = @datadir@
 infodir = @infodir@
 includedir = @includedir@
@@ -81,6 +85,11 @@
 	inst_libdir="$(inst_libdir)" \
 	inst_docdir="$(inst_docdir)" \
 	prefix="$(prefix)" \
+	build="$(build)" \
+	build_alias="$(build_alias)" \
+	host="$(host)" \
+	host_alias="$(host_alias)" \
+	target="$(target)" \
 	target_alias="$(target_alias)" \
 	TAR="$(TAR)" \
 	TARFLAGS="$(TARFLAGS)" \

Modified: trunk/cegcc/src/w32api/configure
===================================================================
--- trunk/cegcc/src/w32api/configure	2007-12-25 23:03:53 UTC (rev 1115)
+++ trunk/cegcc/src/w32api/configure	2007-12-25 23:12:07 UTC (rev 1116)
@@ -1998,7 +1998,7 @@
 fi
 
 
-case "${host}" in
+case "${host_alias}" in
     *-mingw32ce* | *-cegcc*)
         SUBDIRS="libce"
         ;;

Modified: trunk/cegcc/src/w32api/configure.in
===================================================================
--- trunk/cegcc/src/w32api/configure.in	2007-12-25 23:03:53 UTC (rev 1115)
+++ trunk/cegcc/src/w32api/configure.in	2007-12-25 23:12:07 UTC (rev 1116)
@@ -50,7 +50,7 @@
 fi
 AC_SUBST(BUILDENV)
 
-case "${host}" in
+case "${host_alias}" in
     *-mingw32ce* | *-cegcc*)
         SUBDIRS="libce"
         ;;

Modified: trunk/cegcc/src/w32api/libce/Makefile.in
===================================================================
--- trunk/cegcc/src/w32api/libce/Makefile.in	2007-12-25 23:03:53 UTC (rev 1115)
+++ trunk/cegcc/src/w32api/libce/Makefile.in	2007-12-25 23:12:07 UTC (rev 1116)
@@ -18,9 +18,13 @@
 SUBDIRS := 
 subdirs := 
 
-host_alias = @host@
-build_alias = @build@
-target_alias = @target@
+build = @build@
+build_alias = @build_alias@
+host = @host@
+host_alias = @host_alias@
+target = @target@
+target_alias = @target_alias@
+
 prefix = @prefix@
 includedir:=@includedir@
 
@@ -28,14 +32,14 @@
 exec_prefix = @exec_prefix@
 libdir:=@libdir@
 bindir = @bindir@
-ifeq ($(target_alias),$(host_alias))
-ifeq ($(build_alias),$(host_alias))
+ifeq ($(target),$(host))
+ifeq ($(build),$(host))
 tooldir:=$(exec_prefix)
 else
-tooldir:=$(exec_prefix)/$(target_alias)
+tooldir:=$(exec_prefix)/$(host_alias)
 endif
 else
-tooldir:=$(exec_prefix)/$(target_alias)
+tooldir:=$(exec_prefix)/$(host_alias)
 endif
 datadir = @datadir@
 infodir = @infodir@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.