Commit27d2890

committed

Unify the zip rules and variables.

1 parenta839258 commit27d2890Copy full SHA for 27d2890

File tree

+14

-23

lines changed

+14

-23

lines changed

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# PostgreSQL top level makefile`
`3`	`3`	`#`
`4`		`-# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.18 2001/04/08 17:28:10 petere Exp $`
	`4`	`+# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.19 2001/09/17 23:00:27 petere Exp $`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`subdir =`
`@@ -55,9 +55,6 @@ distdir:= postgresql-$(VERSION)`
`55`	`55`	`dummy:= =install=`
`56`	`56`	`garbage := =* "#"* ."#"* ~ .orig .rej core postgresql-*`
`57`	`57`
`58`		`-GZIP:= gzip`
`59`		`-BZIP2:= bzip2`
`60`		`-`
`61`	`58`	`dist: $(distdir).tar.gz`
`62`	`59`	`ifeq ($(split-dist), yes)`
`63`	`60`	`dist: postgresql-base-$(VERSION).tar.gz postgresql-docs-$(VERSION).tar.gz postgresql-opt-$(VERSION).tar.gz postgresql-test-$(VERSION).tar.gz`
`@@ -89,12 +86,6 @@ postgresql-opt-$(VERSION).tar: distdir`
`89`	`86`	`postgresql-test-$(VERSION).tar: distdir`
`90`	`87`	`$(TAR) cf $@ $(distdir)/src/test`
`91`	`88`
`92`		`-%.gz: %`
`93`		`-$(GZIP) -f --best $<`
`94`		`-`
`95`		`-%.bz2: %`
`96`		`-$(BZIP2) -f $<`
`97`		`-`
`98`	`89`	`distdir:`
`99`	`90`	`-rm -rf $(distdir)* $(dummy)`
`100`	`91`	for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
`@@ -112,7 +103,7 @@ distdir:`
`112`	`103`	`distcheck: $(distdir).tar.gz`
`113`	`104`	`-rm -rf $(dummy)`
`114`	`105`	`mkdir $(dummy)`
`115`		`-gzip -d -c $< \| $(TAR) xf -`
	`106`	`+$(GZIP) -d -c $< \| $(TAR) xf -`
`116`	`107`	install_prefix=`cd $(dummy) && pwd`; \
`117`	`108`	`cd $(distdir) \`
`118`	`109`	`&& ./configure --prefix="$$install_prefix"`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`# Postgres documentation makefile`
`2`		`-# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.20 2001/09/14 20:37:54 petere Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.21 2001/09/17 23:00:27 petere Exp $`
`3`	`3`
`4`	`4`	`subdir = doc/src`
`5`	`5`	`top_builddir = ../..`
`6`	`6`	`include$(top_builddir)/src/Makefile.global`
`7`	`7`
`8`		`-TAR= tar`
`9`		`-ZIP= gzip`
`10`	`8`	`ZIPSUFFIX= gz`
`11`	`9`	`TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref`
`12`	`10`
`@@ -65,10 +63,3 @@ postgres.tar:`
`65`	`63`	`man.tar:`
`66`	`64`	`$(MAKE) -C sgml man`
`67`	`65`	`$(TAR) -cf$@ -C sgml man1 man$(sqlmansect_dummy)`
`68`		`-`
`69`		`-# Generic production rules`
`70`		`-`
`71`		`-# Compressed file`
`72`		`-`
`73`		`-%.$(ZIPSUFFIX):%`
`74`		`-$(ZIP) -f$<`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# --makefile--`
`2`		`-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.137 2001/09/16 16:11:09 petere Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.138 2001/09/17 23:00:27 petere Exp $`
`3`	`3`
`4`	`4`	`#------------------------------------------------------------------------------`
`5`	`5`	`# All PostgreSQL makefiles include this file and use the variables it sets,`
`@@ -215,6 +215,9 @@ TAR= @TAR@`
`215`	`215`	`WISH= @WISH@`
`216`	`216`	`XGETTEXT = @XGETTEXT@`
`217`	`217`
	`218`	`+GZIP= gzip`
	`219`	`+BZIP2= bzip2`
	`220`	`+`
`218`	`221`	`# Installation.`
`219`	`222`
`220`	`223`	`INSTALL=$(SHELL)$(top_srcdir)/config/install-sh -c`
`@@ -329,7 +332,13 @@ STRTOUL = @STRTOUL@`
`329`	`332`
`330`	`333`	`##########################################################################`
`331`	`334`	`#`
`332`		`-# Global targets`
	`335`	`+# Global targets and rules`
	`336`	`+`
	`337`	`+%.gz:%`
	`338`	`+$(GZIP) -f --best$<`
	`339`	`+`
	`340`	`+%.bz2:%`
	`341`	`+$(BZIP2) -f$<`
`333`	`342`
`334`	`343`	`# Remake Makefile.global from Makefile.global.in if the latter`
`335`	`344`	`# changed. In order to trigger this rule, the including file must`

Comments

(0)