Commit d38d6003 by Nathanael Nerode

configure.in: Use NCN_TARGET_NONCANONICAL and friends.

	* configure.in: Use NCN_TARGET_NONCANONICAL and friends.
	* configure: Regenerate.
	* Makefile.am: Use target_noncanonical variable from configure.
	* Makefile.in: Regenerate.
	* include/Makefile.in: Regenerate.

From-SVN: r78317
parent 20d0a40e
2004-02-23 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Use NCN_TARGET_NONCANONICAL and friends.
* configure: Regenerate.
* Makefile.am: Use target_noncanonical variable from configure.
* Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
2004-02-20 Andrew Cagney <cagney@redhat.com> 2004-02-20 Andrew Cagney <cagney@redhat.com>
* config.guess: Update from version 2002-01-10 to 2004-02-16. * config.guess: Update from version 2002-01-10 to 2004-02-16.
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
## files that should be in the distribution are not mentioned in this ## files that should be in the distribution are not mentioned in this
## Makefile.am. ## Makefile.am.
target_noncanonical=@target_noncanonical@
AUTOMAKE_OPTIONS = cygnus AUTOMAKE_OPTIONS = cygnus
SUBDIRS = include SUBDIRS = include
......
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
...@@ -95,12 +95,18 @@ addincludes = @addincludes@ ...@@ -95,12 +95,18 @@ addincludes = @addincludes@
addlibs = @addlibs@ addlibs = @addlibs@
addobjs = @addobjs@ addobjs = @addobjs@
addtests = @addtests@ addtests = @addtests@
build_subdir = @build_subdir@
gc_basedir = @gc_basedir@ gc_basedir = @gc_basedir@
host_subdir = @host_subdir@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
ncn_cv_ = @ncn_cv_@
target_all = @target_all@ target_all = @target_all@
target_subdir = @target_subdir@
toolexecdir = @toolexecdir@ toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
target_noncanonical = @target_noncanonical@
AUTOMAKE_OPTIONS = cygnus AUTOMAKE_OPTIONS = cygnus
SUBDIRS = include SUBDIRS = include
...@@ -278,7 +284,7 @@ ltmain.sh mkinstalldirs ...@@ -278,7 +284,7 @@ ltmain.sh mkinstalldirs
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = tar
GZIP_ENV = --best GZIP_ENV = --best
SOURCES = $(libgcjgc_la_SOURCES) $(EXTRA_libgcjgc_la_SOURCES) $(libgcjgc_convenience_la_SOURCES) $(EXTRA_libgcjgc_convenience_la_SOURCES) SOURCES = $(libgcjgc_la_SOURCES) $(EXTRA_libgcjgc_la_SOURCES) $(libgcjgc_convenience_la_SOURCES) $(EXTRA_libgcjgc_convenience_la_SOURCES)
OBJECTS = $(libgcjgc_la_OBJECTS) $(libgcjgc_convenience_la_OBJECTS) OBJECTS = $(libgcjgc_la_OBJECTS) $(libgcjgc_convenience_la_OBJECTS)
...@@ -406,7 +412,7 @@ maintainer-clean-recursive: ...@@ -406,7 +412,7 @@ maintainer-clean-recursive:
dot_seen=no; \ dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \ rev="$$subdir $$rev"; \
test "$$subdir" != "." || dot_seen=yes; \ test "$$subdir" = "." && dot_seen=yes; \
done; \ done; \
test "$$dot_seen" = "no" && rev=". $$rev"; \ test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \ target=`echo $@ | sed s/-recursive//`; \
......
# Copyright (c) 1999, 2000, 2001, 2002, 2003 by Red Hat, Inc. All rights reserved. # Copyright (c) 1999, 2000, 2001, 2002, 2003 by Red Hat, Inc. All rights reserved.
# Copyright 2004 Nathanael Nerode
# #
# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
# OR IMPLIED. ANY USE IS AT YOUR OWN RISK. # OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
...@@ -10,6 +11,7 @@ ...@@ -10,6 +11,7 @@
# modified is included with the above copyright notice. # modified is included with the above copyright notice.
# #
# Original author: Tom Tromey # Original author: Tom Tromey
# Modified by Nathanael Nerode
dnl Process this file with autoconf to produce configure. dnl Process this file with autoconf to produce configure.
...@@ -57,6 +59,12 @@ fi ...@@ -57,6 +59,12 @@ fi
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# Get the 'noncanonical' system names.
sinclude(../config/acx.m4)
_GCC_TOPLEV_NONCANONICAL_BUILD
_GCC_TOPLEV_NONCANONICAL_HOST
_GCC_TOPLEV_NONCANONICAL_TARGET
# This works around an automake problem. # This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
AC_SUBST(mkinstalldirs) AC_SUBST(mkinstalldirs)
...@@ -226,7 +234,7 @@ AC_SUBST(EXTRA_TEST_LIBS) ...@@ -226,7 +234,7 @@ AC_SUBST(EXTRA_TEST_LIBS)
target_all=libgcjgc.la target_all=libgcjgc.la
AC_SUBST(target_all) AC_SUBST(target_all)
AC_SUBST(target_alias) AC_SUBST(target_noncanonical)
dnl If the target is an eCos system, use the appropriate eCos dnl If the target is an eCos system, use the appropriate eCos
dnl I/O routines. dnl I/O routines.
...@@ -457,10 +465,10 @@ AC_ARG_ENABLE(full-debug, ...@@ -457,10 +465,10 @@ AC_ARG_ENABLE(full-debug,
if test -n "$with_cross_host" && if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then test x"$with_cross_host" != x"no"; then
toolexecdir='$(exec_prefix)/$(target_alias)' toolexecdir='$(exec_prefix)/$(target_noncanonical)'
toolexeclibdir='$(toolexecdir)/lib' toolexeclibdir='$(toolexecdir)/lib'
else else
toolexecdir='$(libdir)/gcc-lib/$(target_alias)' toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
toolexeclibdir='$(libdir)' toolexeclibdir='$(libdir)'
fi fi
multi_os_directory=`$CC -print-multi-os-directory` multi_os_directory=`$CC -print-multi-os-directory`
......
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
...@@ -95,9 +95,14 @@ addincludes = @addincludes@ ...@@ -95,9 +95,14 @@ addincludes = @addincludes@
addlibs = @addlibs@ addlibs = @addlibs@
addobjs = @addobjs@ addobjs = @addobjs@
addtests = @addtests@ addtests = @addtests@
build_subdir = @build_subdir@
gc_basedir = @gc_basedir@ gc_basedir = @gc_basedir@
host_subdir = @host_subdir@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
ncn_cv_ = @ncn_cv_@
target_all = @target_all@ target_all = @target_all@
target_noncanonical = @target_noncanonical@
target_subdir = @target_subdir@
toolexecdir = @toolexecdir@ toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
...@@ -114,7 +119,7 @@ DIST_COMMON = Makefile.am Makefile.in ...@@ -114,7 +119,7 @@ DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = tar
GZIP_ENV = --best GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment