From af45dab6d7601890d87287cbafafca84906919a3 Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Fri, 9 Oct 1998 03:08:00 +0000 Subject: [PATCH] Fix for BSDI shared libraries. --- src/backend/parser/gram.c | 2 +- src/backend/parser/scan.c | 2 +- src/interfaces/libpgtcl/Makefile.in | 6 +++--- src/interfaces/libpq/Makefile.in | 6 +++--- src/pl/plpgsql/src/Makefile.in | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c index 38ded341b2b..6e67262da48 100644 --- a/src/backend/parser/gram.c +++ b/src/backend/parser/gram.c @@ -229,7 +229,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.41 1998/10/08 18:29:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.42 1998/10/09 03:07:51 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT diff --git a/src/backend/parser/scan.c b/src/backend/parser/scan.c index 4db7c84f792..0ff46f73f1c 100644 --- a/src/backend/parser/scan.c +++ b/src/backend/parser/scan.c @@ -556,7 +556,7 @@ char *yytext; * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.29 1998/10/08 18:29:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.30 1998/10/09 03:07:54 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in index f77db96fdc8..d1e3b82893d 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.22 1998/10/07 06:50:26 thomas Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.23 1998/10/09 03:07:56 momjian Exp $ # #------------------------------------------------------------------------- @@ -51,14 +51,14 @@ endif ifeq ($(PORTNAME), bsdi) ifdef BSD_SHLIB - ifeq ($(LDSUFFIX), .so) + ifeq ($(DLSUFFIX), .so) install-shlib-dep := install-shlib shlib := libpgtcl.so LD := shlicc LDFLAGS_SL += -O -shared CFLAGS += $(CFLAGS_SL) endif - ifeq ($(LDSUFFIX), .o) + ifeq ($(DLSUFFIX), .o) install-shlib-dep := install-shlib shlib := libpgtcl.o LD := shlicc diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in index fe4ed409002..d9e6714593a 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.30 1998/10/07 06:50:33 thomas Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.31 1998/10/09 03:07:57 momjian Exp $ # #------------------------------------------------------------------------- @@ -58,14 +58,14 @@ endif ifeq ($(PORTNAME), bsdi) ifdef BSD_SHLIB - ifeq ($(LDSUFFIX), .so) + ifeq ($(DLSUFFIX), .so) install-shlib-dep := install-shlib shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LD := shlicc LDFLAGS_SL += -O -shared CFLAGS += $(CFLAGS_SL) endif - ifeq ($(LDSUFFIX), .o) + ifeq ($(DLSUFFIX), .o) install-shlib-dep := install-shlib shlib := libpq.o.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LD :=shlicc diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in index 95cdc6d13fc..cb7b5623cb8 100644 --- a/src/pl/plpgsql/src/Makefile.in +++ b/src/pl/plpgsql/src/Makefile.in @@ -4,7 +4,7 @@ # Makefile for the plpgsql shared object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.1 1998/10/08 23:45:17 momjian Exp $ +# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.2 1998/10/09 03:08:00 momjian Exp $ # #------------------------------------------------------------------------- @@ -42,12 +42,12 @@ endif ifeq ($(PORTNAME), bsdi) ifdef BSD_SHLIB - ifeq ($(LDSUFFIX), .so) + ifeq ($(DLSUFFIX), .so) LD := shlicc LDFLAGS_SL += -O -shared CFLAGS += $(CFLAGS_SL) endif - ifeq ($(LDSUFFIX), .o) + ifeq ($(DLSUFFIX), .o) LD := shlicc LDFLAGS_SL += -O -r CFLAGS += $(CFLAGS_SL) -- GitLab