Fix portname defines in Makefiles.

src/interfaces/libpgtcl/Makefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.16 1998/06/12 18:36:40 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.17 1998/06/15 21:01:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -33,7 +33,7 @@ shlib             :=
 
 LIBPQ			= -L$(SRCDIR)/interfaces/libpq -lpq
 
-ifeq ($(PORTNAME), linux)
+ifeq ($(PORTNAME), linux_i386)
   install-shlib-dep	:= install-shlib
   shlib		:= libpgtcl.so.1
   CFLAGS		+= $(CFLAGS_SL)
@@ -49,14 +49,14 @@ ifeq ($(PORTNAME), bsd)
   endif
 endif
 
-ifeq ($(PORTNAME), i386_solaris)
+ifeq ($(PORTNAME), solaris_i386)
   install-shlib-dep	:= install-shlib
   shlib			:= libpgtcl.so.1
   LDFLAGS_SL		= -G -z text
   CFLAGS		+= $(CFLAGS_SL)
 endif
 
-ifeq ($(PORTNAME), sparc_solaris)
+ifeq ($(PORTNAME), solaris_sparc)
   install-shlib-dep     := install-shlib
   shlib                 := libpgtcl.so.1
   LDFLAGS_SL            = -G

src/interfaces/libpq++/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.16 1998/04/06 16:52:36 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.17 1998/06/15 21:01:48 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -42,16 +42,16 @@ OBJS = pgenv.o pgconnection.o pgtransdb.o pgcursordb.o pglobject.o
 # Shared library stuff
 SHLIB := 
 INSTALL-SHLIB-DEP :=
-ifeq ($(PORTNAME), i386_solaris)
+ifeq ($(PORTNAME), linux_i386)
   INSTALL-SHLIB-DEP := install-shlib
   SHLIB := libpq++.so.1
-  LDFLAGS_SL = -G -z text -shared -soname $(SHLIB)
+  LDFLAGS_SL = -shared -soname $(SHLIB)
   CFLAGS += $(CFLAGS_SL)
 endif
-ifeq ($(PORTNAME), linux)
+ifeq ($(PORTNAME), solaris_i386)
   INSTALL-SHLIB-DEP := install-shlib
   SHLIB := libpq++.so.1
-  LDFLAGS_SL = -shared -soname $(SHLIB)
+  LDFLAGS_SL = -G -z text -shared -soname $(SHLIB)
   CFLAGS += $(CFLAGS_SL)
 endif
 ifeq ($(PORTNAME), hpux)

src/interfaces/libpq/Makefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.19 1998/06/12 18:36:42 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.20 1998/06/15 21:01:47 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,7 +31,7 @@ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
 # Shared library stuff
 shlib := 
 install-shlib-dep :=
-ifeq ($(PORTNAME), linux)
+ifeq ($(PORTNAME), linux_i386)
   install-shlib-dep := install-shlib
   shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
@@ -45,13 +45,13 @@ ifeq ($(PORTNAME), bsd)
     CFLAGS += $(CFLAGS_SL)
   endif
 endif
-ifeq ($(PORTNAME), i386_solaris)
+ifeq ($(PORTNAME), solaris_i386)
   install-shlib-dep := install-shlib
   shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LDFLAGS_SL = -G -z text
   CFLAGS += $(CFLAGS_SL)
 endif
-ifeq ($(PORTNAME), sparc_solaris)
+ifeq ($(PORTNAME), solaris_sparc)
   install-shlib-dep := install-shlib
   shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LDFLAGS_SL = -G