diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-03 16:40:28 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-03 16:40:28 -0400 |
| commit | fcc4a20dd0be2342d35cfa2bad82af22d5169c20 (patch) | |
| tree | f6cbc5e7530b911924f26130bd576123ef166fe2 | |
| parent | d3d3ec0d890412f3b39a70e8fd08edf17e3c9f7c (diff) | |
| download | postgresql-fcc4a20dd0be2342d35cfa2bad82af22d5169c20.tar.gz postgresql-fcc4a20dd0be2342d35cfa2bad82af22d5169c20.zip | |
Back-patch creation of tar.bz2 tarball during "make dist".
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.
| -rw-r--r-- | GNUmakefile.in | 8 | ||||
| -rw-r--r-- | src/Makefile.global.in | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index 5e7575abf9b..c924f305994 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -86,7 +86,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 @@ -96,6 +96,8 @@ dist: $(distdir).tar: distdir $(TAR) chf $@ $(distdir) +.INTERMEDIATE: $(distdir).tar + opt_files = \ src/tools src/tutorial \ $(addprefix src/pl/, plperl plpython tcl) @@ -134,10 +136,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 763bdc004a0..17d3772e96c 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -476,10 +476,10 @@ TAS = @TAS@ $(CPP) $(CPPFLAGS) -o $@ $< %.gz: % - $(GZIP) -f --best $< + $(GZIP) --best -c $< >$@ %.bz2: % - $(BZIP2) -f $< + $(BZIP2) -c $< >$@ ifndef PGXS |