Commit 27d2890b authored by Peter Eisentraut's avatar Peter Eisentraut

Unify the zip rules and variables.

parent a839258d
# #
# PostgreSQL top level makefile # 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 = subdir =
...@@ -55,9 +55,6 @@ distdir := postgresql-$(VERSION) ...@@ -55,9 +55,6 @@ distdir := postgresql-$(VERSION)
dummy := =install= dummy := =install=
garbage := =* "#"* ."#"* *~* *.orig *.rej core postgresql-* garbage := =* "#"* ."#"* *~* *.orig *.rej core postgresql-*
GZIP := gzip
BZIP2 := bzip2
dist: $(distdir).tar.gz dist: $(distdir).tar.gz
ifeq ($(split-dist), yes) 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 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 ...@@ -89,12 +86,6 @@ postgresql-opt-$(VERSION).tar: distdir
postgresql-test-$(VERSION).tar: distdir postgresql-test-$(VERSION).tar: distdir
$(TAR) cf $@ $(distdir)/src/test $(TAR) cf $@ $(distdir)/src/test
%.gz: %
$(GZIP) -f --best $<
%.bz2: %
$(BZIP2) -f $<
distdir: distdir:
-rm -rf $(distdir)* $(dummy) -rm -rf $(distdir)* $(dummy)
for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \ for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
...@@ -112,7 +103,7 @@ distdir: ...@@ -112,7 +103,7 @@ distdir:
distcheck: $(distdir).tar.gz distcheck: $(distdir).tar.gz
-rm -rf $(dummy) -rm -rf $(dummy)
mkdir $(dummy) mkdir $(dummy)
gzip -d -c $< | $(TAR) xf - $(GZIP) -d -c $< | $(TAR) xf -
install_prefix=`cd $(dummy) && pwd`; \ install_prefix=`cd $(dummy) && pwd`; \
cd $(distdir) \ cd $(distdir) \
&& ./configure --prefix="$$install_prefix" && ./configure --prefix="$$install_prefix"
......
# Postgres documentation makefile # 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 subdir = doc/src
top_builddir = ../.. top_builddir = ../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
TAR= tar
ZIP= gzip
ZIPSUFFIX= gz ZIPSUFFIX= gz
TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref
...@@ -65,10 +63,3 @@ postgres.tar: ...@@ -65,10 +63,3 @@ postgres.tar:
man.tar: man.tar:
$(MAKE) -C sgml man $(MAKE) -C sgml man
$(TAR) -cf $@ -C sgml man1 man$(sqlmansect_dummy) $(TAR) -cf $@ -C sgml man1 man$(sqlmansect_dummy)
# Generic production rules
# Compressed file
%.$(ZIPSUFFIX): %
$(ZIP) -f $<
# -*-makefile-*- # -*-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, # All PostgreSQL makefiles include this file and use the variables it sets,
...@@ -215,6 +215,9 @@ TAR = @TAR@ ...@@ -215,6 +215,9 @@ TAR = @TAR@
WISH = @WISH@ WISH = @WISH@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
GZIP = gzip
BZIP2 = bzip2
# Installation. # Installation.
INSTALL = $(SHELL) $(top_srcdir)/config/install-sh -c INSTALL = $(SHELL) $(top_srcdir)/config/install-sh -c
...@@ -329,7 +332,13 @@ STRTOUL = @STRTOUL@ ...@@ -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 # Remake Makefile.global from Makefile.global.in if the latter
# changed. In order to trigger this rule, the including file must # changed. In order to trigger this rule, the including file must
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment