2002-08-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* gcc3newlib/base-gnat.add: Don't use %{%prefix}/bin/gnat*.
	* gcc3newlib/Makefile.am: Use mkspec for c4x.
	* gcc3newlib/gccnewlib.add: Rework processing of %if %build_XXX.
	Rework handing Ada.
	Don't put adalib and adainclude into files.gcc.
	* gcc3newlib/target-gnat.add: Add adalib.
	Add adainclude.

5 files changed, 39 insertions, 14 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index a4dbecd429..f67e3d51e9 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-13	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* gcc3newlib/base-gnat.add: Don't use %{%prefix}/bin/gnat*.
+	* gcc3newlib/Makefile.am: Use mkspec for c4x.
+	* gcc3newlib/target-gnat.add: Rework processing of %if %build_XXX.
+	Rework handing Ada.
+	Don't put adalib and adainclude into files.gcc.
+	* gcc3newlib/target-gnat.add: Add adalib.
+	Add adainclude.
+
 2002-08-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* gcc3newlib/base-gnat.add: Use -n rtems-base-gnat.
diff --git a/scripts/gcc3newlib/Makefile.am b/scripts/gcc3newlib/Makefile.am
index 6eee24319e..8a23fc2d18 100644
--- a/scripts/gcc3newlib/Makefile.am
+++ b/scripts/gcc3newlib/Makefile.am
@@ -37,8 +37,8 @@ arm-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@
 RPM_SPECS_DATA += arm-rtems-$(GCC3NEWLIBVERS).spec
 
-c4x-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIB_C_ONLY_SPEC_DEPS)
-	$(MKSPEC) $(C_ONLY_ARG) -cfg $(top_builddir)/setup.cache c4x-rtems > $@
+c4x-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIB_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@
 RPM_SPECS_DATA += c4x-rtems-$(GCC3NEWLIBVERS).spec
 
 h8300-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
diff --git a/scripts/gcc3newlib/base-gnat.add b/scripts/gcc3newlib/base-gnat.add
index 01ee537a67..6dd961eef9 100644
--- a/scripts/gcc3newlib/base-gnat.add
+++ b/scripts/gcc3newlib/base-gnat.add
@@ -14,5 +14,5 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 
 %files -n rtems-base-gnat
 %dir %{_prefix}/bin
-%{_prefix}/bin/gnat*
+# %{_prefix}/bin/gnat*
 %endif
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index 23e7790610..d85aae708b 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -50,16 +50,22 @@ NoSource:	1
 %define build_gnat	0
 
 %if "@target_alias@"     == "c4x-rtems"
-%define build_gnat 	0
 %define build_cxx	0
-%elseif "@target_alias@" == "i386-rtems"
+%endif
+
+%if "@target_alias@" == "i386-rtems"
 %define build_gnat 	1
-%elseif "@target_alias@" == "i960-rtems"
-%define build_gnat      0
+%endif
+
+%if "@target_alias@" == "i960-rtems"
 %define build_cxx	0
-%elseif "@target_alias@" == "powerpc-rtems"
+%endif
+
+%if "@target_alias@" == "powerpc-rtems"
 %define build_gnat      1
-%elseif "@target_alias@" == "sparc-rtems"
+%endif
+
+%if "@target_alias@" == "sparc-rtems"
 %define build_gnat      1
 %endif
 
@@ -102,7 +108,10 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 #    CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
 # %endif
 
-  languages="c,c++"
+  languages="c"
+%if %build_cxx
+  languages="$languages,c++"
+%endif
 %if %build_g77
   languages="$languages,g77"
 %endif
@@ -128,11 +137,11 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %endif
   make all
 %if %build_gnat
-  cd gcc
 # This is what is documented, but it doesn't work for me (RC)
 #  make gnatlib_and_tools
-  make cross-gnattools
-  cd ..
+  make -C gcc cross-gnattools
+  make -C gcc ada.all.cross
+  make -C gcc gnatlib
 %endif
   make info
 
@@ -144,7 +153,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 #    $RPM_BUILD_ROOT%{_prefix}/@target_alias@/bin
 #
 
-  make prefix=$RPM_BUILD_ROOT%{_prefix} install
+  make prefix=$RPM_BUILD_ROOT%{_prefix} \
+    bindir=$RPM_BUILD_ROOT%{_bindir} install
   cd @target_alias@/newlib
   make prefix=$RPM_BUILD_ROOT%{_prefix} \
     bindir=$RPM_BUILD_ROOT%{_bindir} install-info
@@ -215,6 +225,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
     *libobjc*) echo "$i" >> files.objc ;;
     *include/objc*) ;;
     *include/g++*);;
+    *adainclude*);;
+    *adalib*);;
+    *gnat1);;
     *jc1) ;;
     *jvgenmain) ;;
     *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
diff --git a/scripts/gcc3newlib/target-gnat.add b/scripts/gcc3newlib/target-gnat.add
index f47d227c1d..0aecd23159 100644
--- a/scripts/gcc3newlib/target-gnat.add
+++ b/scripts/gcc3newlib/target-gnat.add
@@ -19,4 +19,6 @@ This is the gcc/gnat compiler for @target_alias@
 %{_prefix}/bin/@target_alias@-gnat*
 
 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/gnat1@exe_ext@
+%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/adalib
+%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/adainclude
 %endif