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/gdb/.cvsignore  |  1 +
 scripts-ada/gdb/Makefile.am | 20 ++++++++------------
 scripts-ada/gdb/gdb.spec.in |  6 +++---
 3 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'scripts-ada/gdb')

diff --git a/scripts-ada/gdb/.cvsignore b/scripts-ada/gdb/.cvsignore
index 9662404700..029350c2f5 100644
--- a/scripts-ada/gdb/.cvsignore
+++ b/scripts-ada/gdb/.cvsignore
@@ -1,3 +1,4 @@
+*.spec
 Makefile
 Makefile.in
 gdb.spec
diff --git a/scripts-ada/gdb/Makefile.am b/scripts-ada/gdb/Makefile.am
index 28c40a8ed5..13040218c6 100644
--- a/scripts-ada/gdb/Makefile.am
+++ b/scripts-ada/gdb/Makefile.am
@@ -2,12 +2,12 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
 
-MKGDBSPEC_DEPS = \
-$(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache
+MKGDBSPEC_DEPS = $(top_builddir)/mkgdbspec gdb.spec.in \
+    $(top_builddir)/setup.cache
 
 powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
@@ -15,17 +15,13 @@ powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
-TEMPLATES = \
-gdb.spec.in
+TEMPLATES = gdb.spec.in
 
-RPM_SPECS_DATA = \
-powerpc-rtems-$(GDBVERS).spec \
-sparc-rtems-$(GDBVERS).spec
+RPM_SPECS_DATA = powerpc-rtems-$(GDBVERS).spec sparc-rtems-$(GDBVERS).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/gdb/gdb.spec.in b/scripts-ada/gdb/gdb.spec.in
index e63c393db8..34b3981374 100644
--- a/scripts-ada/gdb/gdb.spec.in
+++ b/scripts-ada/gdb/gdb.spec.in
@@ -12,7 +12,7 @@ Vendor:       OAR Corporation
 Distribution: Linux
 Name:         @target_alias@-gnat-gdb-collection
 Release:      @Release@
-Copyright:    1999 OARCorp
+License:      GPL/LGPL
 Group:        gnatrtems
 Provides:     rtems-base-gnat-gdb @target_alias@-gnat-gdb
 
@@ -23,7 +23,7 @@ Version:      @gdb_version@
 Summary:      gdb for target @target_alias@
 Source0:      ftp://ftp.gnu.org/pub/gnu/gdb-@gdb_version@.tar.gz
 Source1:	ftp://cs.nyu.edu/pub/gnat/gnat-@gnat_version@-src.tar.gz
-Patch0:	      gdb-@gdb_version@-rtems-@gdb_patch_version@.diff
+Patch0:	      gdb-@gdb_version@-rtems-gnat-@gnat_version@-@gdb_patch_version@.diff
 Buildroot:	/tmp
 
 #
@@ -127,7 +127,7 @@ test -d build || mkdir build
 %dir /opt/gnatrtems/info
 %doc /opt/gnatrtems/info/gdb.info*
 %doc /opt/gnatrtems/info/mmalloc.info*
-%doc /opt/gnatrtems/info/readline.info*
+# %doc /opt/gnatrtems/info/readline.info*
 
 %dir /opt/gnatrtems/man
 %dir /opt/gnatrtems/man/man1
-- 
cgit v1.2.3