From: Darren King <aixssd!darrenk@abs.net>

Subject: [PATCHES] AIX make patch resubmitted.

Misc patches for AIX from Darren:

1)  New src/makefiles/Makefile.aix  This patch should only be
    applied if the following patch (4) is applied to backend/Makefile!
    Still looking into having configure determine the last line to do
    the shared link.  The 325 code will work for 41, so I put that in
    as the default.  Included a commented out 41 line for completeness.

*and*

4)  Patch the backend Makefile.  I've reviewed this patch with respect to the
    other ports that use MAKE_EXPORTS (svr4 and univel) as closely as I could
    and I don't see where it will break them.  If it does, please let me know
    and I'll rework it somehow.

diff --git a/src/backend/Makefile b/src/backend/Makefile
index a5389a7..15365ff 100644 (file)
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.23 1997/04/04 10:38:49 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.24 1997/05/22 00:11:23 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -51,13 +51,7 @@ endif
 
 OBJS = $(DIRS:%=%/SUBSYS.o)
 
-ifeq ($(MAKE_EXPORTS), true)
-EXP = postgres$(EXPSUFF)
-else
-EXP =
-endif
-
-all: postgres $(EXP) global1.bki.source local1_template1.bki.source
+all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source
 
 postgres: $(OBJS) ../utils/version.o
        $(CC) -o postgres $(OBJS) ../utils/version.o $(LDFLAGS)
@@ -96,7 +90,7 @@ fmgr.h:
 
 #############################################################################
 clean:
-       rm -f postgres fmgr.h parse.h \
+       rm -f postgres $(POSTGRES_IMP) fmgr.h parse.h \
            global1.bki.source local1_template1.bki.source
        for i in $(DIRS); do $(MAKE) -C $$i clean PORTNAME=$(PORTNAME); done
 
@@ -119,13 +113,13 @@ clean:
 # and (2) the parameters of a database system should be set at initdb time,
 # not at postgres build time.
 
-install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(EXP) fmgr.h\
+install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
          global1.bki.source local1_template1.bki.source \
          libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
        
        $(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
 ifeq ($(MAKE_EXPORTS), true)
-       $(INSTALL) $(INSTLOPTS) postgres$(EXPSUFF) $(LIBDIR)/postgres$(EXPSUFF)
+       $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
 endif
        @rm -f $(BINDIR)/postmaster
        cd $(BINDIR); ln -s postgres postmaster

diff --git a/src/backend/port/aix/mkldexport.sh b/src/backend/port/aix/mkldexport.sh
index 3447ebd..87f78b0 100755 (executable)
--- a/src/backend/port/aix/mkldexport.sh
+++ b/src/backend/port/aix/mkldexport.sh
@@ -33,7 +33,7 @@ if [ -z "$2" ]; then
 else
        echo '#!' $2/$OBJNAME
 fi
-$NM -g $1 | \
+$NM -Bg $1 | \
        egrep ' [TD] ' | \
        sed -e 's/.* //' | \
        egrep -v '\$' | \