First clean compile without a "PORTNAME" variable being set...

src/backend/port/Makefile.in

@@ -19,33 +19,32 @@
 # be converted to Method 2.  
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.7 1997/12/19 02:56:16 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.8 1997/12/20 00:10:14 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR=../..
 include ../../Makefile.global
 
-OBJS = @PORTNAME@/SUBSYS.o @INET_ATON@ @STRERROR@ @RANDOM@ @SRANDOM@
+INCLUDE_OPT = -I..
+
+CFLAGS+= INCLUDE_OPT
+
+OBJS = dynloader.o @INET_ATON@ @STRERROR@ @RANDOM@ @SRANDOM@
 OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@
 
-all: submake SUBSYS.o
+all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
 	$(LD) -r -o SUBSYS.o $(OBJS)
 
-.PHONY: submake clean dep
-
-submake:
-	$(MAKE) -C @PORTNAME@ SUBSYS.o
+.PHONY: clean dep
 
 clean:
 	rm -f SUBSYS.o $(OBJS)
-	$(MAKE) -C @PORTNAME@ clean
 
 depend dep:
 	$(CC) -MM $(INCLUDE_OPT) *.c >depend
-	$(MAKE) -C @PORTNAME@ $@
 
 ifeq (depend,$(wildcard depend))
 include depend

src/backend/port/dynloader/bsd.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "port-protos.h"
+#include "dynloader.h"
 
 static char error_message[BUFSIZ];
 

src/backend/utils/adt/numutils.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.18 1997/12/19 02:08:01 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.19 1997/12/20 00:10:29 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,10 +28,6 @@
 #include <string.h>
 #endif
 
-#ifndef HAVE_FCVT
-#  include <port-protos.h>		/* ecvt(), fcvt() */
-#endif
-
 #ifndef INT_MAX
 #define INT_MAX (0x7FFFFFFFL)
 #endif

src/backend/utils/fmgr/dfmgr.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.13 1997/09/18 20:22:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.14 1997/12/20 00:10:42 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,8 @@
 #include "access/heapam.h"
 #include "nodes/pg_list.h"
 
-#include "port-protos.h"		/* system specific function prototypes */
+#include "dynloader.h"
+
 #ifdef __ultrix
 #include <dl.h>
 #endif

src/backend/utils/init/postinit.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.20 1997/11/24 05:09:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.21 1997/12/20 00:10:47 scrappy Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -66,7 +66,6 @@
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
 
-#include "port-protos.h"
 #include "libpq/libpq-be.h"
 
 static void VerifySystemDatabase(void);

src/bin/initlocation/initlocation

@@ -12,7 +12,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation,v 1.2 1997/12/09 03:11:16 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation,v 1.3 1997/12/20 00:10:51 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 

src/configure.in

@@ -12,21 +12,9 @@ case "$host_os" in
    sunos*) PORTNAME='sunos4' ;;
    linux*) PORTNAME='linux' ;;
     bsdi*) PORTNAME='bsdi' ;;
- freebsd*|netbsd*) 
-			AC_LINK_FILES(backend/port/dynloader/bsd.c, 
-						  backend/port/dynloader/dynloader.c)
-			AC_LINK_FILES(backend/port/dynloader/bsd.h, include/dynloader.h)
-			AC_LINK_FILES(include/port/bsd.h, include/os.h)
-			AC_LINK_FILES(makefiles/Makefile.bsd, Makefile.port)
-			;;
+ freebsd*|netbsd*) os=bsd ;;
     dgux*) PORTNAME='dgux';;
-     aix*) 
-			AC_LINK_FILES(backend/port/dynloader/aix.c, 
-						  backend/port/dynloader/dynloader.c)
-			AC_LINK_FILES(backend/port/dynloader/aix.h, include/dynloader.h)
-			AC_LINK_FILES(include/port/aix.h, include/os.h)
-			AC_LINK_FILES(makefiles/Makefile.aix, Makefile.port)
-			;;
+     aix*) os=aix ;;
 nextstep*) PORTNAME='nextstep';;
   ultrix*) PORTNAME='ultrix4';;
     irix*) PORTNAME='irix5';;
@@ -52,6 +40,11 @@ nextstep*) PORTNAME='nextstep';;
    exit;;
 esac
 
+AC_LINK_FILES(backend/port/dynloader/${os}.c, backend/port/dynloader.c)
+AC_LINK_FILES(backend/port/dynloader/${os}.h, include/dynloader.h)
+AC_LINK_FILES(include/port/${os}.h, include/os.h)
+AC_LINK_FILES(makefiles/Makefile.${os}, Makefile.port) 
+
 AC_SUBST(PORTNAME)
 
 echo "checking echo setting..."