Unify the zip rules and variables.

GNUmakefile.in

@@ -1,7 +1,7 @@
 #
 # PostgreSQL top level makefile
 #
-# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.18 2001/04/08 17:28:10 petere Exp $
+# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.19 2001/09/17 23:00:27 petere Exp $
 #
 
 subdir =
@@ -55,9 +55,6 @@ distdir	:= postgresql-$(VERSION)
 dummy	:= =install=
 garbage := =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
-GZIP	:= gzip
-BZIP2	:= bzip2
-
 dist: $(distdir).tar.gz
 ifeq ($(split-dist), yes)
 dist: postgresql-base-$(VERSION).tar.gz postgresql-docs-$(VERSION).tar.gz postgresql-opt-$(VERSION).tar.gz postgresql-test-$(VERSION).tar.gz
@@ -89,12 +86,6 @@ postgresql-opt-$(VERSION).tar: distdir
 postgresql-test-$(VERSION).tar: distdir
 	$(TAR) cf $@ $(distdir)/src/test
 
-%.gz: %
-	$(GZIP) -f --best $<
-
-%.bz2: %
-	$(BZIP2) -f $<
-
 distdir:
 	-rm -rf $(distdir)* $(dummy)
 	for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
@@ -112,7 +103,7 @@ distdir:
 distcheck: $(distdir).tar.gz
 	-rm -rf $(dummy)
 	mkdir $(dummy)
-	gzip -d -c $< | $(TAR) xf -
+	$(GZIP) -d -c $< | $(TAR) xf -
 	install_prefix=`cd $(dummy) && pwd`; \
 	cd $(distdir) \
 	&& ./configure --prefix="$$install_prefix"

doc/src/Makefile

@@ -1,12 +1,10 @@
 # Postgres documentation makefile
-# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.20 2001/09/14 20:37:54 petere Exp $
+# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.21 2001/09/17 23:00:27 petere Exp $
 
 subdir = doc/src
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-TAR= tar
-ZIP= gzip
 ZIPSUFFIX= gz
 TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref
 
@@ -65,10 +63,3 @@ postgres.tar:
 man.tar:
 	$(MAKE) -C sgml man
 	$(TAR) -cf $@ -C sgml man1 man$(sqlmansect_dummy)
-
-# Generic production rules
-
-# Compressed file
-
-%.$(ZIPSUFFIX):	%
-	$(ZIP) -f $<

src/Makefile.global.in

@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.137 2001/09/16 16:11:09 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.138 2001/09/17 23:00:27 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -215,6 +215,9 @@ TAR	= @TAR@
 WISH	= @WISH@
 XGETTEXT = @XGETTEXT@
 
+GZIP	= gzip
+BZIP2	= bzip2
+
 # Installation.
 
 INSTALL	= $(SHELL) $(top_srcdir)/config/install-sh -c
@@ -329,7 +332,13 @@ STRTOUL = @STRTOUL@
 
 ##########################################################################
 #
-# Global targets
+# Global targets and rules
+
+%.gz: %
+	$(GZIP) -f --best $<
+
+%.bz2: %
+	$(BZIP2) -f $<
 
 # Remake Makefile.global from Makefile.global.in if the latter
 # changed. In order to trigger this rule, the including file must