Commit405ced2

committed

Various fixes resulting from removing the PORTNAME defines

From: Tom I Helbekkmo <tih@Hamartun.Priv.NO>

1 parent374bb5d commit405ced2Copy full SHA for 405ced2

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4360,7 +4360,7 @@ done`
`4360`	`4360`
`4361`	`4361`	`ac_given_srcdir=$srcdir`
`4362`	`4362`
`4363`		-trap 'rm -fr`echo"GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh include/config.h"\| sed"s/:[^ ]//g"` conftest; exit 1' 1 2 15
	`4363`	+trap 'rm -fr`echo"GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.shinterfaces/libpq/Makefile interfaces/libpgtcl/Makefileinclude/config.h"\| sed"s/:[^ ]//g"` conftest; exit 1' 1 2 15
`4364`	`4364`	`EOF`
`4365`	`4365`	`cat>>$CONFIG_STATUS<<EOF`
`4366`	`4366`
`@@ -4480,7 +4480,7 @@ EOF`
`4480`	`4480`
`4481`	`4481`	`cat>>$CONFIG_STATUS<<EOF`
`4482`	`4482`
`4483`		`-CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh"}`
	`4483`	`+CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile"}`
`4484`	`4484`	`EOF`
`4485`	`4485`	`cat>>$CONFIG_STATUS<<\EOF`
`4486`	`4486`	`for ac_file in ..$CONFIG_FILES; do if test "x$ac_file" != x..; then`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -523,4 +523,4 @@ else`
`523`	`523`	`fi`
`524`	`524`
`525`	`525`
`526`		`-AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh)`
	`526`	`+AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile)`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.17 1997/10/28 15:13:10 vadim Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.1 1998/01/13 04:18:04 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -20,6 +20,8 @@ INCLUDE_OPT= \`
`20`	`20`	`-I$(LIBPQDIR)\`
`21`	`21`	`-I$(TCL_INCDIR)`
`22`	`22`
	`23`	`+PORTNAME=@PORTNAME@`
	`24`	`+`
`23`	`25`	`CFLAGS+=$(INCLUDE_OPT)`
`24`	`26`	`ifdefKRBVERS`
`25`	`27`	`CFLAGS+=$(KRBFLAGS)`
`@@ -39,7 +41,7 @@ ifeq ($(PORTNAME), linux)`
`39`	`41`	`endif`
`40`	`42`	`endif`
`41`	`43`
`42`		`-ifeq ($(PORTNAME),BSD44_derived)`
	`44`	`+ifeq ($(PORTNAME),bsd)`
`43`	`45`	`install-shlib-dep:= install-shlib`
`44`	`46`	`shlib:= libpgtcl.so.1.0`
`45`	`47`	`LDFLAGS_SL= -x -Bshareable -Bforcearchive`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.37 1997/08/17 00:33:28 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.1 1998/01/13 04:18:22 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -17,6 +17,8 @@ include $(SRCDIR)/Makefile.global`
`17`	`17`	`# We need the backend directory here for its fmgr.h`
`18`	`18`	`INCLUDE_OPT= -I$(SRCDIR)/include -I$(SRCDIR)/backend`
`19`	`19`
	`20`	`+PORTNAME=@PORTNAME@`
	`21`	`+`
`20`	`22`	`CFLAGS+=$(INCLUDE_OPT)`
`21`	`23`
`22`	`24`	`ifdefKRBVERS`
`@@ -37,7 +39,7 @@ ifeq ($(PORTNAME), linux)`
`37`	`39`	`CFLAGS +=$(CFLAGS_SL)`
`38`	`40`	`endif`
`39`	`41`	`endif`
`40`		`-ifeq ($(PORTNAME),BSD44_derived)`
	`42`	`+ifeq ($(PORTNAME),bsd)`
`41`	`43`	`install-shlib-dep := install-shlib`
`42`	`44`	`shlib := libpq.so.1.0`
`43`	`45`	`LDFLAGS_SL = -x -Bshareable -Bforcearchive`

Comments

(0)