Merged from 4.5.0-beta3a

scripts-ada/binutils/.cvsignore

@@ -1,3 +1,4 @@
+*.spec
 Makefile
 Makefile.in
 binutils.spec

scripts-ada/binutils/Makefile.am

@@ -2,26 +2,23 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec
 
-MKBINUTILSSPEC_DEPS = \
-$(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache
+MKBINUTILSSPEC_DEPS = $(top_builddir)/mkbinutilspec binutils.spec.in \
+    $(top_builddir)/setup.cache
 
 sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
-TEMPLATES = \
-binutils.spec.in
+TEMPLATES = binutils.spec.in
 
-RPM_SPECS_DATA = \
-sparc-rtems-$(BINUTILSVERS).spec
+RPM_SPECS_DATA = sparc-rtems-$(BINUTILSVERS).spec
 
-noinst_DATA = \
-$(TEMPLATES)
+noinst_DATA = $(TEMPLATES)
 
-EXTRA_DIST = \
-$(TEMPLATES)
+EXTRA_DIST = $(TEMPLATES)
 
 CLEANFILES = $(RPM_SPECS_DATA)
+include $(top_srcdir)/../automake/local.am

scripts-ada/binutils/binutils.spec.in

@@ -12,7 +12,7 @@ Name:         @target_alias@-gnat-binutils-collection
 Summary:      binutils for target @target_alias@
 Group:        gnatrtems
 Release:      @Release@
-Copyright:    1999 OARCorp
+License:      GPL/LGPL
 
 Provides:     rtems-base-gnat-binutils @target_alias@-gnat-binutils