(binutils.tar.z, &c): Updated for making binutils FSF release.

(taz): Try harder to catch errors in subdir invocations of make.

1 files changed, 31 insertions, 16 deletions

diff --git a/Makefile.in b/Makefile.in
index 42539ce..bb4d209 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -652,6 +652,7 @@ gcc-no-fixedincludes:
 	  rm -rf gcc/tmp-include; \
 	  mv gcc/include gcc/tmp-include 2>/dev/null; \
 	  mkdir gcc/include; \
+	  cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
 	  touch gcc/stmp-fixinc; \
 	  rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
 	  rootme=`pwd`; export rootme; \
@@ -1045,30 +1046,35 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
 # When you use `make setup-dirs' or `make taz' you should always redefine
 # this macro.
 SUPPORT_FILES = list-of-support-files-for-tool-in-question
-# Directories that might want `make proto-dir' run.
-PROTODIRS= gdb
+# Directories that might want `make diststuff' run.
+DISTSTUFFDIRS= ld gprof gdb
 
 .PHONY: taz
 
-taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex texinfo/gpl.texinfo
 	./configure sun4
 	$(MAKE) clean
 	./configure -rm sun4
 	chmod og=u `find etc $(DEVO_SUPPORT) $(SUPPORT_FILES) -print`
-	# Make links, and run "proto-dir" stuff when needed.
+	# Make links, and run "make diststuff" when needed.
 	# The `echo' for setting `p' is to convert all whitespace to spaces.
 	# Then the `case' further below should tell whether $$d is in
-	# PROTODIRS.
+	# DISTSTUFFDIRS.
 	rm -rf proto-toplev ; mkdir proto-toplev
-	dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
-	p=" `echo $(PROTODIRS)` " ; \
+	set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
+	p=" `echo $(DISTSTUFFDIRS)` " ; \
 	for d in $$dirs ; do \
 	  if [ -d $$d ]; then \
-	    case " $(PROTODIRS) " in \
-	    "* $$d *")	(cd $$d ; $(MAKE) -f Makefile.in proto-dir) ; \
-			ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ;; \
-	    *)		ln -s ../$$d proto-toplev/$$d ;; \
+	    case " $$p " in \
+	    *" $$d "*)	\
+		echo making diststuff in $$d ; \
+		(cd $$d ; $(MAKE) -f Makefile.in diststuff) || exit 1  ;; \
 	    esac ; \
+	    if [ -d $$d/proto-$$d.dir ]; then \
+	      ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \
+	    else \
+	      ln -s ../$$d proto-toplev/$$d ; \
+	    fi ; \
 	  else ln -s ../$$d proto-toplev/$$d ; fi ; \
 	done
 	#
@@ -1093,23 +1099,32 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
 	#
 	mkdir proto-toplev/texinfo
 	ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/
+	ln -s ../../texinfo/gpl.texinfo proto-toplev/texinfo/
 	ln -s ../../texinfo/tex3patch   proto-toplev/texinfo/
 	chmod og=u `find proto-toplev -print`
-	(VER=`sed <$(TOOL)/Makefile.in -n 's/VERSION *= *//p'`; \
+	(VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \
 		echo "==> Making $(TOOL)-$$VER.tar.z"; \
 		ln -s proto-toplev $(TOOL)-$$VER; \
 		tar cfh - $(TOOL)-$$VER \
-		| $(GZIP) -v >$(TOOL)-$$VER.tar.z)
+		| $(GZIP) -v -9 >$(TOOL)-$$VER.tar.z)
 
-GAS_SUPPORT_DIRS= bfd include libiberty opcodes
+TEXINFO_SUPPORT= texinfo/texinfo.tex texinfo/gpl.texinfo
+DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
 
 .PHONY: gas.tar.z
-gas.tar.z: $(DEVO_SUPPORT) $(GAS_SUPPORT_DIRS) gas texinfo/texinfo.tex
+GAS_SUPPORT_DIRS= bfd include libiberty opcodes
+gas.tar.z: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
 	$(MAKE) -f Makefile.in taz SUPPORT_FILES="$(GAS_SUPPORT_DIRS)" TOOL=gas
 
+# The FSF "binutils" release includes gprof and ld.
+.PHONY: binutils.tar.z
+BINUTILS_SUPPORT_DIRS= bfd include libiberty opcodes ld gprof
+binutils.tar.z: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
+	$(MAKE) -f Makefile.in taz SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)" TOOL=binutils
+
 .PHONY: gas+binutils.tar.z
 GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof
-gas+binutils.tar.z: $(DEVO_SUPPORT) $(GASB_SUPPORT_DIRS) gas texinfo/texinfo.tex
+gas+binutils.tar.z: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
 	$(MAKE) -f Makefile.in taz SUPPORT_FILES="$(GASB_SUPPORT_DIRS)" TOOL=gas
 
 .NOEXPORT: