From 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 21 Oct 1999 15:59:54 +0000
Subject: Changes from Ralf with script-19991021-0.  He fixed the %files issue
 and has mkbspspec in a better state.  user.cfg is now gone.

There are some miscellaneous changes to buildall done by Joel
to clean up the build process.
---
 scripts/binutils/Makefile.am      | 23 +++++++++++++----------
 scripts/binutils/Makefile.in      |  8 +++++++-
 scripts/binutils/binutils.spec.in |  6 +++---
 3 files changed, 23 insertions(+), 14 deletions(-)

(limited to 'scripts/binutils')

diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index cd387d196c..b586eccebc 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -1,32 +1,35 @@
+## $Id$
+
 AUTOMAKE_OPTIONS = foreign
 
-MKBINUTILSSPEC = $(SHELL) $(top_srcdir)/mkbinutilspec
+MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec
 
-MKBINUTILSSPEC_DEPS = ../mkbinutilspec binutils.spec.in ../setup.cache
+MKBINUTILSSPEC_DEPS = \
+$(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache
 
 i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . i386-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
 
 sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
 
 powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . powerpc-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
 sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sparc-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
 
 mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . mips64orion-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
 
 i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . i960-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
 
 hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
 
 TEMPLATES = \
 binutils.spec.in
diff --git a/scripts/binutils/Makefile.in b/scripts/binutils/Makefile.in
index db2758c7d4..fc6640b762 100644
--- a/scripts/binutils/Makefile.in
+++ b/scripts/binutils/Makefile.in
@@ -76,7 +76,7 @@ MKBINUTILSSPEC_DEPS = ../mkbinutilspec binutils.spec.in ../setup.cache
 TEMPLATES =  binutils.spec.in
 
 
-RPM_SPECS_DATA =  i386-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec powerpc-rtems-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec m68k-rtems-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec hppa1.1-rtems-$(BINUTILSVERS).spec
+RPM_SPECS_DATA =  i386-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec sh-rtemself-$(BINUTILSVERS).spec powerpc-rtems-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec m68k-rtems-$(BINUTILSVERS).spec m68k-rtemself-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec hppa1.1-rtems-$(BINUTILSVERS).spec
 
 
 noinst_DATA =  $(TEMPLATES)
@@ -218,6 +218,9 @@ i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtems
 
+sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtemself
+
 powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . powerpc-rtems
 
@@ -227,6 +230,9 @@ sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtems
 
+m68k-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtemself
+
 mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . mips64orion-rtems
 
diff --git a/scripts/binutils/binutils.spec.in b/scripts/binutils/binutils.spec.in
index bc0a5b8837..bbcad0e7bd 100644
--- a/scripts/binutils/binutils.spec.in
+++ b/scripts/binutils/binutils.spec.in
@@ -93,7 +93,7 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
   fi
 
 %files -f files
-%dir /opt/rtems/info
+%docdir /opt/rtems/info
 %doc /opt/rtems/info/dir
 %doc /opt/rtems/info/as.info.gz
 %doc /opt/rtems/info/as.info-?.gz
@@ -106,8 +106,8 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
 %doc /opt/rtems/info/gasp.info.gz
 %doc /opt/rtems/info/standards.info.gz
 
-%dir /opt/rtems/man
-%dir /opt/rtems/man/man1
+%docdir /opt/rtems/man
+%docdir /opt/rtems/man/man1
 %doc /opt/rtems/man/man1/@target_alias@-*.1
 
 %dir /opt/rtems/bin
-- 
cgit v1.2.3