NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit41fd969

committed

Back-patch creation of tar.bz2 tarball during "make dist".

Since commita4d03bb, "make dist" hasbuilt both gzip- and bzip2-compressed tarballs. However, this waspretty useless, because our tarball build script didn't know about itand proceeded to overwrite the bz2 file with new data. Back-patch thechange to all active branches, so that creation of the tar.bz2 filecan be removed from the build script.

1 parent457c2d9 commit41fd969Copy full SHA for 41fd969

File tree

2 files changed

-5

lines changed

2 files changed

-5

lines changed

`‎GNUmakefile.in`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ distdir:= postgresql-$(VERSION)`
`67`	`67`	`dummy:= =install=`
`68`	`68`	`garbage := =* "#"* ."#"* ~ .orig .rej core postgresql-*`
`69`	`69`
`70`		`-dist: $(distdir).tar.gz`
	`70`	`+dist: $(distdir).tar.gz$(distdir).tar.bz2`
`71`	`71`	`ifeq ($(split-dist), yes)`
`72`	`72`	`dist: postgresql-base-$(VERSION).tar.gz postgresql-docs-$(VERSION).tar.gz postgresql-opt-$(VERSION).tar.gz postgresql-test-$(VERSION).tar.gz`
`73`	`73`	`endif`
`@@ -77,6 +77,8 @@ dist:`
`77`	`77`	`$(distdir).tar: distdir`
`78`	`78`	`$(TAR) chf $@ $(distdir)`
`79`	`79`
	`80`	`+.INTERMEDIATE: $(distdir).tar`
	`81`	`+`
`80`	`82`	`opt_files := \`
`81`	`83`	`src/tools src/tutorial \`
`82`	`84`	`$(addprefix src/pl/, plperl plpython tcl)`
`@@ -115,10 +117,10 @@ distdir:`
`115`	`117`	`$(MAKE) -C $(distdir) distclean`
`116`	`118`	`rm -f $(distdir)/README.git`
`117`	`119`
`118`		`-distcheck:$(distdir).tar.gz`
	`120`	`+distcheck:dist`
`119`	`121`	`-rm -rf $(dummy)`
`120`	`122`	`mkdir $(dummy)`
`121`		`-$(GZIP) -d -c $< \| $(TAR) xf -`
	`123`	`+$(GZIP) -d -c $(distdir).tar.gz \| $(TAR) xf -`
`122`	`124`	install_prefix=`cd $(dummy) && pwd`; \
`123`	`125`	`cd $(distdir) \`
`124`	`126`	`&& ./configure --prefix="$$install_prefix"`

`‎src/Makefile.global.in`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -441,10 +441,10 @@ TAS = @TAS@`
`441`	`441`	`# Global targets and rules`
`442`	`442`
`443`	`443`	`%.gz:%`
`444`		`-$(GZIP) -f --best$<`
	`444`	`+$(GZIP) --best-c$<>$@`
`445`	`445`
`446`	`446`	`%.bz2:%`
`447`		`-$(BZIP2) -f$<`
	`447`	`+$(BZIP2) -c$<>$@`
`448`	`448`
`449`	`449`	`ifeq ($(PORTNAME),win32)`
`450`	`450`	`# Build rules to add versioninfo resources to win32 binaries`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit41fd969

File tree

2 files changed

2 files changed

`‎GNUmakefile.in`

`‎src/Makefile.global.in`

0 commit comments