aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile.in8
-rw-r--r--src/Makefile.global.in4
2 files changed, 7 insertions, 5 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in
index eb48277abde..83f632c5ca7 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -67,7 +67,7 @@ distdir := postgresql-$(VERSION)
dummy := =install=
garbage := =* "#"* ."#"* *~* *.orig *.rej core postgresql-*
-dist: $(distdir).tar.gz
+dist: $(distdir).tar.gz $(distdir).tar.bz2
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
endif
@@ -77,6 +77,8 @@ dist:
$(distdir).tar: distdir
$(TAR) chf $@ $(distdir)
+.INTERMEDIATE: $(distdir).tar
+
opt_files := \
src/tools src/tutorial \
$(addprefix src/pl/, plperl plpython tcl)
@@ -115,10 +117,10 @@ distdir:
$(MAKE) -C $(distdir) distclean
rm -f $(distdir)/README.git
-distcheck: $(distdir).tar.gz
+distcheck: dist
-rm -rf $(dummy)
mkdir $(dummy)
- $(GZIP) -d -c $< | $(TAR) xf -
+ $(GZIP) -d -c $(distdir).tar.gz | $(TAR) xf -
install_prefix=`cd $(dummy) && pwd`; \
cd $(distdir) \
&& ./configure --prefix="$$install_prefix"
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 820dfd59653..3eeb3e09f68 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -441,10 +441,10 @@ TAS = @TAS@
# Global targets and rules
%.gz: %
- $(GZIP) -f --best $<
+ $(GZIP) --best -c $< >$@
%.bz2: %
- $(BZIP2) -f $<
+ $(BZIP2) -c $< >$@
ifeq ($(PORTNAME),win32)
# Build rules to add versioninfo resources to win32 binaries