From f62b28a93b8c2775fc73315cdc1886fcc8afd80a Mon Sep 17 00:00:00 2001
From: Laurent GUERBY <laurent@guerby.net>
Date: Fri, 29 Aug 2008 13:44:25 +0000
Subject: [PATCH] Makefile.in (FLAGS_TO_PASS): renamed to LIBADA_FLAGS_TO_PASS
 to avoid conflicts.

2008-08-29  Laurent Guerby  <laurent@guerby.net>

	* Makefile.in (FLAGS_TO_PASS): renamed to LIBADA_FLAGS_TO_PASS to
	avoid conflicts. Factor more flags to pass.
	(libsubdir): New variable.
	(install-gnatlib): New target.

From-SVN: r139767
---
 libada/ChangeLog   |  7 +++++++
 libada/Makefile.in | 34 +++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 891d9b1c781..4f1c8217784 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-29  Laurent Guerby  <laurent@guerby.net>
+	
+	* Makefile.in (FLAGS_TO_PASS): renamed to LIBADA_FLAGS_TO_PASS to
+	avoid conflicts. Factor more flags to pass.
+	(libsubdir): New variable.
+	(install-gnatlib): New target.
+
 2008-08-28  Laurent Guerby  <laurent@guerby.net>
 
 	* configure: Regenerate.
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 01759f36881..05a42335f01 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -51,15 +51,25 @@ host_subdir = @host_subdir@
 GCC_DIR=../../$(host_subdir)/gcc
 include $(GCC_DIR)/libgcc.mvars
 
+target_noncanonical:=@target_noncanonical@
+version := $(shell cat $(srcdir)/../gcc/BASE-VER)
+libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)
+
 # exeext should not be used because it's the *host* exeext.  We're building
 # a *target* library, aren't we?!?  Likewise for CC.  Still, provide bogus
 # definitions just in case something slips through the safety net provided
 # by recursive make invocations in gcc/ada/Makefile.in
-FLAGS_TO_PASS = \
+LIBADA_FLAGS_TO_PASS = \
         "MAKEOVERRIDES=" \
         "LDFLAGS=$(LDFLAGS)" \
         "LN_S=$(LN_S)" \
         "SHELL=$(SHELL)" \
+        "GNATLIBFLAGS=$(GNATLIBFLAGS)" \
+        "GNATLIBCFLAGS=$(GNATLIBCFLAGS)" \
+        "TARGET_LIBGCC2_CFLAGS=$(TARGET_LIBGCC2_CFLAGS)" \
+        "THREAD_KIND=$(THREAD_KIND)" \
+        "TRACE=$(TRACE)" \
+        "libsubdir=$(libsubdir)" \
         "objext=$(objext)" \
         "prefix=$(prefix)" \
         "exeext=.exeext.should.not.be.used " \
@@ -73,29 +83,19 @@ gnatlib: @default_gnatlib_target@
 
 gnatlib-plain: oscons $(GCC_DIR)/ada/Makefile
 	test -f stamp-libada || \
-	$(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
-	  GNATLIBFLAGS="$(GNATLIBFLAGS)" \
-	  GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-	  TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
-	  THREAD_KIND="$(THREAD_KIND)" \
-	  TRACE="$(TRACE)" \
-	  gnatlib \
+	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \
 	&& touch stamp-libada
 
 gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile
 	test -f stamp-libada || \
-	$(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
-	  GNATLIBFLAGS="$(GNATLIBFLAGS)" \
-	  GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-	  TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
-	  THREAD_KIND="$(THREAD_KIND)" \
-	  TRACE="$(TRACE)" \
-	  $@ \
+	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \
 	&& touch stamp-libada
 
 oscons:
-	$(MAKE) -C $(GCC_DIR) THREAD_KIND="$(THREAD_KIND)" \
-	  $(FLAGS_TO_PASS) ada/s-oscons.ads
+	$(MAKE) -C $(GCC_DIR) $(LIBADA_FLAGS_TO_PASS) ada/s-oscons.ads
+
+install-gnatlib: $(GCC_DIR)/ada/Makefile
+	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib
 
 # Check uninstalled version.
 check: