* Makefile.in (COMPRESS): Remove def.

	* Makefile.in (gdb.tar.gz, make-gdb.tar.gz):  Renamed from
	gdb.tar.Z and make-gdb.tar.Z respectively.
	* Makefile.in (make-gdb.tar.gz):  Now only build gzip'd archive.
	* Makefile.in (make-gdb.tar.gz):  Minor changes to move closer
	to convergence with 'taz' target in Makefile.in.

1 files changed, 10 insertions, 17 deletions

diff --git a/Makefile.in b/Makefile.in
index 13b1c09382..ad004e0b2d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,7 +65,6 @@ RANLIB = ranlib
 NM = nm
 MUNCH_NM = $(NM)
 GZIP = gzip
-COMPRESS = compress
 
 # BISON: This line sed'ed to BISON = bison -y for FSF releases, don't remove.
 BISON = `if [ -f $${rootme}/byacc/byacc ] ; \
@@ -234,7 +233,6 @@ BASE_FLAGS_TO_PASS = \
 	"INSTALL_XFORM=$(INSTALL_XFORM)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"LEX=$(LEX)" \
-	"LOADLIBES=$(LOADLIBES)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
 	"MUNCH_NM=$(MUNCH_NM)" \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
@@ -949,19 +947,19 @@ ETC_SUPPORT= Makefile.in cfg-paper.texi configure.in configure.man \
 GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline glob sim
 GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS)
 
-.PHONY: setup-dirs-gdb gdb.tar.Z make-gdb.tar.Z
+.PHONY: setup-dirs-gdb gdb.tar.gz make-gdb.tar.gz
 setup-dirs-gdb:
 	./configure sun4
 	$(MAKE) clean
 	./configure -rm sun4
 	chmod og=u `find etc $(DEVO_SUPPORT) $(GDB_SUPPORT_FILES) -print`
 
-gdb.tar.Z: setup-dirs-gdb
+gdb.tar.gz: setup-dirs-gdb
 	(cd gdb; $(MAKE) -f Makefile.in make-proto-gdb.dir BISON="byacc")
 	(cd gdb; $(MAKE) -f Makefile.in make-proto-testsuite.dir)
-	$(MAKE) $(MFLAGS) -f Makefile.in make-gdb.tar.Z
+	$(MAKE) $(MFLAGS) -f Makefile.in make-gdb.tar.gz
 
-make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
+make-gdb.tar.gz: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
 	rm -rf proto-toplev; mkdir proto-toplev
 	ln -s ../gdb/proto-gdb.dir proto-toplev/gdb
 	(cd proto-toplev; for i in $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS); do \
@@ -995,14 +993,14 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb 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 <gdb/Makefile.in -n 's/VERSION = //p'`; \
-		ln -s proto-toplev gdb-$$VER; \
-		echo "==> Making gdb-$$VER.tar.Z"; \
-		tar cfh - gdb-$$VER | $(COMPRESS) -v >gdb-$$VER.tar.Z; \
 		echo "==> Making gdb-$$VER.tar.gz"; \
-		tar cfh - gdb-$$VER | $(GZIP) -v -9 >gdb-$$VER.tar.gz)
+		rm -f gdb-$$VER; ln -s proto-toplev gdb-$$VER; \
+		tar cfh - gdb-$$VER \
+		| $(GZIP) -v -9 >gdb-$$VER.tar.gz)
 
 	# Make the testsuite archive separately.
 	ln -s ../../gdb/proto-testsuite.dir/testsuite proto-toplev/gdb/testsuite
@@ -1014,16 +1012,11 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
 	ln proto-toplev/gdb/COPYING proto-toplev/gdb/testsuite/COPYING
 	chmod og=u `find proto-toplev/gdb/testsuite -print`
 	(VER=`sed <gdb/Makefile.in -n 's/VERSION = //p'`; \
-		echo "==> Making gdb-$$VER-testsuite.tar.Z"; \
-		tar cfh - gdb-$$VER/configure gdb-$$VER/config.guess \
-			gdb-$$VER/config.sub gdb-$$VER/move-if-change \
-			gdb-$$VER/gdb/testsuite | \
-			$(COMPRESS) -v >gdb-$$VER-testsuite.tar.Z; \
 		echo "==> Making gdb-$$VER-testsuite.tar.gz"; \
 		tar cfh - gdb-$$VER/configure gdb-$$VER/config.guess \
 			gdb-$$VER/config.sub gdb-$$VER/move-if-change \
-			gdb-$$VER/gdb/testsuite | \
-			$(GZIP) -v -9 >gdb-$$VER-testsuite.tar.gz)
+			gdb-$$VER/gdb/testsuite \
+			| $(GZIP) -v -9 >gdb-$$VER-testsuite.tar.gz)
 
 # When you use `make setup-dirs' or `make taz' you should always redefine
 # this macro.