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/rtems/.cvsignore    |  1 +
 scripts/rtems/Makefile.am   | 33 ++++++++++++++-------------------
 scripts/rtems/rtems.spec.in |  2 +-
 3 files changed, 16 insertions(+), 20 deletions(-)

(limited to 'scripts/rtems')

diff --git a/scripts/rtems/.cvsignore b/scripts/rtems/.cvsignore
index a0b0091404..8e68a95411 100644
--- a/scripts/rtems/.cvsignore
+++ b/scripts/rtems/.cvsignore
@@ -1,3 +1,4 @@
+*.spec
 Makefile
 Makefile.in
 rtems.spec
diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am
index d6cce0214d..e8a8026821 100644
--- a/scripts/rtems/Makefile.am
+++ b/scripts/rtems/Makefile.am
@@ -2,11 +2,12 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKBSPSPEC = $(SHELL) $(top_builddir)/mkbspspec
 
-MKBSPSPEC_DEPS = $(top_builddir)/mkbspspec rtems.spec.in $(top_builddir)/setup.cache
+MKBSPSPEC_DEPS = $(top_builddir)/mkbspspec rtems.spec.in \
+    $(top_builddir)/setup.cache
 
 hppa1.1-rtems-simhppa-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
 	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems simhppa
@@ -38,25 +39,19 @@ sh-rtemself-gensh1-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
 sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
 	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems erc32
 
-TEMPLATES = \
-rtems.spec.in
+TEMPLATES = rtems.spec.in
 
-RPM_SPECS_DATA = \
-hppa1.1-rtems-simhppa-$(BSPVERS).spec \
-i386-rtems-pc386-$(BSPVERS).spec \
-i960-rtems-cvme961-$(BSPVERS).spec \
-m68k-rtems-gen68360-$(BSPVERS).spec \
-m68k-rtemself-gen68360-$(BSPVERS).spec \
-mips64orion-rtems-p4600-$(BSPVERS).spec \
-powerpc-rtems-mcp750-$(BSPVERS).spec \
-sh-rtems-gensh1-$(BSPVERS).spec \
-sh-rtemself-gensh1-$(BSPVERS).spec \
-sparc-rtems-erc32-$(BSPVERS).spec
+RPM_SPECS_DATA = hppa1.1-rtems-simhppa-$(BSPVERS).spec \
+    i386-rtems-pc386-$(BSPVERS).spec i960-rtems-cvme961-$(BSPVERS).spec \
+    m68k-rtems-gen68360-$(BSPVERS).spec \
+    m68k-rtemself-gen68360-$(BSPVERS).spec \
+    mips64orion-rtems-p4600-$(BSPVERS).spec \
+    powerpc-rtems-mcp750-$(BSPVERS).spec sh-rtems-gensh1-$(BSPVERS).spec \
+    sh-rtemself-gensh1-$(BSPVERS).spec sparc-rtems-erc32-$(BSPVERS).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/rtems/rtems.spec.in b/scripts/rtems/rtems.spec.in
index f2ba46395b..a4cabaf055 100644
--- a/scripts/rtems/rtems.spec.in
+++ b/scripts/rtems/rtems.spec.in
@@ -10,7 +10,7 @@ Vendor:       OAR Corporation
 Distribution: Linux
 Name:         rtems-@target_alias@-@bsp@
 Release:      @Release@
-Copyright:    1999 OARCorp
+License:      GPL with special exception for linking with application program
 Group:        unsorted
 Provides:     rtems-@target_alias@-@bsp@
 
-- 
cgit v1.2.3