mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-15 08:20:16 +08:00
Back-patch creation of tar.bz2 tarball during "make dist".
Since commit a4d03bbcda
, "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.
This commit is contained in:
parent
ca43ce9eba
commit
8de6e9472f
@ -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"
|
||||
|
@ -449,10 +449,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
|
||||
|
Loading…
Reference in New Issue
Block a user