Merged scripts-19991022-0 changes from Ralf.

2 files changed, 14 insertions, 22 deletions

diff --git a/scripts/binutils/Makefile.in b/scripts/binutils/Makefile.in
index 5be140f630..20f4078328 100644
--- a/scripts/binutils/Makefile.in
+++ b/scripts/binutils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -97,14 +96,14 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign binutils/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps binutils/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -136,15 +135,10 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = binutils
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign binutils/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -173,7 +167,7 @@ uninstall: uninstall-am
 all-am: Makefile $(DATA)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(RPM_SPECSdir)
 
diff --git a/scripts/binutils/binutils.spec.in b/scripts/binutils/binutils.spec.in
index b8f8b85862..49945c45c5 100644
--- a/scripts/binutils/binutils.spec.in
+++ b/scripts/binutils/binutils.spec.in
@@ -47,14 +47,13 @@ Authors:
     ...
 
 %prep
-echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
 # untar the sources inside @target_alias@-binutils
 %setup -c -n @target_alias@-binutils -a 0
 
 %patch0 -p0
+  test -d build || mkdir build
 
 %build
-  test -d build || mkdir build
   cd build
   ../binutils-@binutils_version@/configure --target=@target_alias@ \
     --verbose --prefix=/opt/rtems 
@@ -89,7 +88,7 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
   then
     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
+    test x"$f" != x"" && for i in $f; do
       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     done
   fi
@@ -99,13 +98,13 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
   then
     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
+    test x"$f" != x"" && for i in $f; do
       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     done
   fi
 
 %files -f files
-%docdir /opt/rtems/info
+%dir /opt/rtems/info
 %doc /opt/rtems/info/dir
 %doc /opt/rtems/info/as.info.gz
 %doc /opt/rtems/info/as.info-?.gz
@@ -118,8 +117,8 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
 %doc /opt/rtems/info/gasp.info.gz
 %doc /opt/rtems/info/standards.info.gz
 
-%docdir /opt/rtems/man
-%docdir /opt/rtems/man/man1
+%dir /opt/rtems/man
+%dir /opt/rtems/man/man1
 %doc /opt/rtems/man/man1/@target_alias@-*.1
 
 %dir /opt/rtems/bin
@@ -161,5 +160,4 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
 /opt/rtems/@target_alias@/bin/strip
 
 %dir /opt/rtems/@target_alias@/lib
-%dir /opt/rtems/@target_alias@/lib/ldscripts
-/opt/rtems/@target_alias@/lib/ldscripts/*
+/opt/rtems/@target_alias@/lib/ldscripts