summaryrefslogtreecommitdiff
path: root/src/pl
diff options
context:
space:
mode:
authorBruce Momjian2000-03-08 01:58:46 +0000
committerBruce Momjian2000-03-08 01:58:46 +0000
commitf43ec05d05bb22e7bd398ea7a8399d157eca6fb4 (patch)
tree6ba6e867726640a9f313539a51c2814b36dc511c /src/pl
parent26c953e3732150e8992f4d1ad3da703b9587e175 (diff)
I've made a diff against the 7.0beta1 tree that accomplishes several things:
1) adds NetBSD shared lib support on both ELF and a.out platforms 2) replaces "-L$(LIBPQDIR) -lpq" with "$(LIBPQ)" defined in Makefile.global. This makes it much easier to build stuff in the source tree after you've already installed the libraries. 3) adds TEMPLATEDIR in Makefile.global that indicates where the database templates are stored. This separates the template files from real libraries that are installed in $(LIBDIR). 4) changes include order of <readline/readline.h> and <readline.h>. The latest GNU readline installs its headers under a readline subdirectory. In addition to applying the patch below the following files need to be copied: backend/port/dynloader: bsd.h -> netbsd.h bsd.c -> netbsd.c include/port: bsd.h -> netbsd.h makefiles: Makefile.bsd -> Makefile.netbsd It would be great to see this incorporated into the source tree before the 7.0 release is cut. Thanks! -- Johnny C. Lam <lamj@stat.cmu.edu>
Diffstat (limited to 'src/pl')
-rw-r--r--src/pl/plpgsql/src/Makefile.in4
-rw-r--r--src/pl/tcl/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in
index 781c483301..049cbde284 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.20 2000/02/23 22:24:45 momjian Exp $
+# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.21 2000/03/08 01:58:44 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -31,7 +31,7 @@ endif
OBJS= pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
-SHLIB_LINK+= -L$(LIBPQDIR) -lpq
+SHLIB_LINK+= $(LIBPQ)
# If crypt is a separate library, rather than part of libc, it may need
# to be referenced separately to keep (broken) linkers happy. (This is
diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index 8e400e1dfa..085baeb592 100644
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -4,7 +4,7 @@
# Makefile for the pltcl shared object
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.10 1998/12/13 23:46:49 tgl Exp $
+# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.11 2000/03/08 01:58:46 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -75,7 +75,7 @@ CFLAGS+= -I$(SRCDIR)/backend
CFLAGS+= $(TCL_DEFS)
-LDADD+= -L$(LIBPQDIR) -lpq
+LDADD+= $(LIBPQ)
#
# DLOBJS is the dynamically-loaded object file.