More Merge's from Dr' sourec tree

diff --git a/src/mk/port/postgres.mk.aix b/src/mk/port/postgres.mk.aix
index d9a60fd6fe3252cf42b002e07edbda96c9be7df9..592443e08e7984d8ef52245970a29b2f364ff380 100644 (file)
--- a/src/mk/port/postgres.mk.aix
+++ b/src/mk/port/postgres.mk.aix
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1994-5, Regents of the University of California
 #
-#    $Id: postgres.mk.aix,v 1.1.1.1 1996/07/09 06:22:20 scrappy Exp $
+#    $Id: postgres.mk.aix,v 1.2 1996/07/23 03:24:47 scrappy Exp $
 #
 #   
 #-------------------------------------------------------------------------
@@ -43,8 +43,10 @@ CFLAGS_BE+= -qchars=signed -qmaxmem=4000 -DHAVE_ANSI_CPP
 EXPSUFF=       .exp
 SLSUFF=                .so
 
+MKLDEXPORT=$(srcdir)/backend/port/aix/mkldexport.sh
+
 %$(EXPSUFF):  %.o
-       mkldexport $(objdir)/$(<F) `pwd` > $(objdir)/$(@F)
+       $(MKLDEXPORT) $(objdir)/$(<F) `pwd` > $(objdir)/$(@F)
 
 %.so: %.o %$(EXPSUFF)
        @echo The link stage here:

diff --git a/src/mk/port/postgres.mk.sparc_solaris b/src/mk/port/postgres.mk.sparc_solaris
index 129138ae27f8e1f6d45565b9775e1cbbdc02dbc0..4f86e1859f1808918b8b5c17a73954224773e129 100644 (file)
--- a/src/mk/port/postgres.mk.sparc_solaris
+++ b/src/mk/port/postgres.mk.sparc_solaris
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1994-5, Regents of the University of California
 #
-#    $Id: postgres.mk.sparc_solaris,v 1.1.1.1 1996/07/09 06:22:20 scrappy Exp $
+#    $Id: postgres.mk.sparc_solaris,v 1.2 1996/07/23 03:24:47 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 ifndef MK_PORT
@@ -29,7 +29,7 @@ INSTALL=/usr/ucb/install
 # everything to compile.  :-/
 #
 # The extra -I flag is to scoop up extra BSD-emulating headers.
-CFLAGS_BE+= -DSYSV_DIRENT -I$(POSTGRESDIR)/src/backend/port/sparc_solaris
+CFLAGS_BE+= -DSYSV_DIRENT -I$(srcdir)/backend/port/sparc_solaris
 LDADD_BE+= -lsocket -lnsl
 
 LD_ADD+= $(LDADD_BE)