From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 scripts-ada/binutils/.cvsignore       |  1 +
 scripts-ada/binutils/Makefile.am      | 19 ++++++++-----------
 scripts-ada/binutils/binutils.spec.in |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'scripts-ada/binutils')

diff --git a/scripts-ada/binutils/.cvsignore b/scripts-ada/binutils/.cvsignore
index 52555123f4..7c7f767d13 100644
--- a/scripts-ada/binutils/.cvsignore
+++ b/scripts-ada/binutils/.cvsignore
@@ -1,3 +1,4 @@
+*.spec
 Makefile
 Makefile.in
 binutils.spec
diff --git a/scripts-ada/binutils/Makefile.am b/scripts-ada/binutils/Makefile.am
index fb6187f3bf..a2b96e2996 100644
--- a/scripts-ada/binutils/Makefile.am
+++ b/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
diff --git a/scripts-ada/binutils/binutils.spec.in b/scripts-ada/binutils/binutils.spec.in
index eb063a250a..af08581889 100644
--- a/scripts-ada/binutils/binutils.spec.in
+++ b/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
 
-- 
cgit v1.2.3