From a0f95aceb4963731644b8eed0308beac76e9934c Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 15 Jun 1998 21:01:54 +0000
Subject: [PATCH] Fix portname defines in Makefiles.
---
src/interfaces/libpgtcl/Makefile.in | 8 ++++----
src/interfaces/libpq++/Makefile | 10 +++++-----
src/interfaces/libpq/Makefile.in | 8 ++++----
.../{Makefile.i386_solaris => Makefile.solaris_i386} | 0
.../{Makefile.sparc_solaris => Makefile.solaris_sparc} | 0
5 files changed, 13 insertions(+), 13 deletions(-)
rename src/makefiles/{Makefile.i386_solaris => Makefile.solaris_i386} (100%)
rename src/makefiles/{Makefile.sparc_solaris => Makefile.solaris_sparc} (100%)
diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index 59caedf1c12..72bd6ae4a75 100644
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/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
diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile
index 5b1d5cfbc5d..da16b32f506 100644
--- a/src/interfaces/libpq++/Makefile
+++ b/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)
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 3cd5660c93c..fc2e1f51f0b 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/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
diff --git a/src/makefiles/Makefile.i386_solaris b/src/makefiles/Makefile.solaris_i386
similarity index 100%
rename from src/makefiles/Makefile.i386_solaris
rename to src/makefiles/Makefile.solaris_i386
diff --git a/src/makefiles/Makefile.sparc_solaris b/src/makefiles/Makefile.solaris_sparc
similarity index 100%
rename from src/makefiles/Makefile.sparc_solaris
rename to src/makefiles/Makefile.solaris_sparc
--
GitLab