diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-11-03 21:28:10 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-11-03 21:28:10 +0000 |
| commit | a4d03bbcdaf7739d7e9073ee76bb186f68ddc163 (patch) | |
| tree | 9223ce9743f81eb9fb0178a0cacd8743518ef9fe | |
| parent | 16cd34a4352cc61d52b0aa99a8ece0926d236b03 (diff) | |
| download | postgresql-a4d03bbcdaf7739d7e9073ee76bb186f68ddc163.tar.gz postgresql-a4d03bbcdaf7739d7e9073ee76bb186f68ddc163.zip | |
Build bzip2 tarball in dist target as well
| -rw-r--r-- | GNUmakefile.in | 10 | ||||
| -rw-r--r-- | src/Makefile.global.in | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index 34a8bd15b78..d934b19d951 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,7 +1,7 @@ # # PostgreSQL top level makefile # -# $PostgreSQL: pgsql/GNUmakefile.in,v 1.54 2009/10/29 21:57:17 petere Exp $ +# $PostgreSQL: pgsql/GNUmakefile.in,v 1.55 2009/11/03 21:28:10 petere Exp $ # subdir = @@ -70,12 +70,14 @@ distdir = postgresql-$(VERSION) dummy = =install= garbage = =* "#"* ."#"* *~* *.orig *.rej core postgresql-* -dist: $(distdir).tar.gz +dist: $(distdir).tar.gz $(distdir).tar.bz2 rm -rf $(distdir) $(distdir).tar: distdir $(TAR) chf $@ $(distdir) +.INTERMEDIATE: $(distdir).tar + distdir-location: @echo $(distdir) @@ -98,10 +100,10 @@ distdir: $(MAKE) -C $(distdir) distclean rm -f $(distdir)/README.CVS -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 c781e22f48f..37441a8003a 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.258 2009/08/26 22:24:42 petere Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.259 2009/11/03 21:28:10 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -475,10 +475,10 @@ TAS = @TAS@ $(CPP) $(CPPFLAGS) -o $@ $< %.gz: % - $(GZIP) -f --best $< + $(GZIP) --best -c $< >$@ %.bz2: % - $(BZIP2) -f $< + $(BZIP2) -c $< >$@ ifndef PGXS |