Commit94e5642

committed

More Merge's from Dr' sourec tree

1 parent245686d commit94e5642Copy full SHA for 94e5642

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`	`# Copyright (c) 1994-5, Regents of the University of California`
`7`	`7`	`#`
`8`		`-# $Id: postgres.mk.aix,v 1.1.1.1 1996/07/09 06:22:20 scrappy Exp $`
	`8`	`+# $Id: postgres.mk.aix,v 1.2 1996/07/23 03:24:47 scrappy Exp $`
`9`	`9`	`#`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`@@ -43,8 +43,10 @@ CFLAGS_BE+= -qchars=signed -qmaxmem=4000 -DHAVE_ANSI_CPP`
`43`	`43`	`EXPSUFF=.exp`
`44`	`44`	`SLSUFF=.so`
`45`	`45`
	`46`	`+MKLDEXPORT=$(srcdir)/backend/port/aix/mkldexport.sh`
	`47`	`+`
`46`	`48`	`%$(EXPSUFF): %.o`
`47`		-mkldexport $(objdir)/$(<F) `pwd` > $(objdir)/$(@F)
	`49`	+$(MKLDEXPORT) $(objdir)/$(<F) `pwd` > $(objdir)/$(@F)
`48`	`50`
`49`	`51`	`%.so: %.o %$(EXPSUFF)`
`50`	`52`	`@echo The link stage here:`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`	`# Copyright (c) 1994-5, Regents of the University of California`
`7`	`7`	`#`
`8`		`-# $Id: postgres.mk.sparc_solaris,v 1.1.1.1 1996/07/09 06:22:20 scrappy Exp $`
	`8`	`+# $Id: postgres.mk.sparc_solaris,v 1.2 1996/07/23 03:24:47 scrappy Exp $`
`9`	`9`	`#`
`10`	`10`	`#-------------------------------------------------------------------------`
`11`	`11`	`ifndef MK_PORT`
`@@ -29,7 +29,7 @@ INSTALL=/usr/ucb/install`
`29`	`29`	`# everything to compile. :-/`
`30`	`30`	`#`
`31`	`31`	`# The extra -I flag is to scoop up extra BSD-emulating headers.`
`32`		`-CFLAGS_BE+= -DSYSV_DIRENT -I$(POSTGRESDIR)/src/backend/port/sparc_solaris`
	`32`	`+CFLAGS_BE+= -DSYSV_DIRENT -I$(srcdir)/backend/port/sparc_solaris`
`33`	`33`	`LDADD_BE+= -lsocket -lnsl`
`34`	`34`
`35`	`35`	`LD_ADD+= $(LDADD_BE)`

Comments

(0)