From f43ec05d05bb22e7bd398ea7a8399d157eca6fb4 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Wed, 8 Mar 2000 01:58:46 +0000 Subject: 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 and . 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 --- src/interfaces/ecpg/lib/Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/interfaces/ecpg') diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in index a462030ff5..de846dd7f9 100644 --- a/src/interfaces/ecpg/lib/Makefile.in +++ b/src/interfaces/ecpg/lib/Makefile.in @@ -6,18 +6,18 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.62 2000/03/07 15:10:52 meskes Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.63 2000/03/08 01:58:24 momjian Exp $ # #------------------------------------------------------------------------- NAME= ecpg SO_MAJOR_VERSION= 3 -SO_MINOR_VERSION= 1.0 +SO_MINOR_VERSION= 1 SRCDIR= @top_srcdir@ include $(SRCDIR)/Makefile.global -CFLAGS+= -I../include -I$(SRCDIR)/interfaces/libpq +CFLAGS+= -I../include -I$(LIBPQDIR) ifdef KRBVERS CFLAGS+= $(KRBFLAGS) @@ -26,7 +26,7 @@ endif OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \ connect.o misc.o -SHLIB_LINK= -L../../libpq -lpq +SHLIB_LINK= $(LIBPQ) # Shared library stuff, also default 'all' target include $(SRCDIR)/Makefile.shlib -- cgit v1.2.1