projects / postgresql.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 457c2d9)
Back-patch creation of tar.bz2 tarball during "make dist".
authorTom Lane <tgl@sss.pgh.pa.us>
Sun, 3 Jul 2011 20:40:37 +0000 (16:40 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Sun, 3 Jul 2011 20:40:37 +0000 (16:40 -0400)
Since commit a4d03bbcdaf7739d7e9073ee76bb186f68ddc163, "make dist" has
built both gzip- and bzip2-compressed tarballs.  However, this was
pretty useless, because our tarball build script didn't know about it
and proceeded to overwrite the bz2 file with new data.  Back-patch the
change to all active branches, so that creation of the tar.bz2 file
can be removed from the build script.

GNUmakefile.in patch | blob | blame | history
src/Makefile.global.in patch | blob | blame | history

diff --git a/GNUmakefile.in b/GNUmakefile.in
index eb48277abde288f97cd60341c1f9828d13e3656a..83f632c5ca718ad48ed51baad70a0a2f7ac8345c 100644 (file)
--- 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 820dfd596533246d308b1b1d368b9a88431baa58..3eeb3e09f68141e5c18fbc7ddbca8e71b42261b5 100644 (file)
--- 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
This is the main PostgreSQL git repository.