diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-09-19 15:36:08 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-09-19 15:36:08 +0000 |
| commit | 9b5e108ee9d2fff1fc0dd6f6929582bb2744f0a9 (patch) | |
| tree | c6636ec33671594be5cd4302b164cdec31049fea /src/interfaces | |
| parent | 48fe13742571aa5185daecf8330b6dcf73b61901 (diff) | |
| download | postgresql-9b5e108ee9d2fff1fc0dd6f6929582bb2744f0a9.tar.gz postgresql-9b5e108ee9d2fff1fc0dd6f6929582bb2744f0a9.zip | |
Fix shared library creation to work properly on AIX. Albe Laurenz
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/test/Makefile.regress | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/compat_informix/Makefile | 7 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/pg_regress.sh | 10 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/interfaces/ecpg/test/Makefile.regress b/src/interfaces/ecpg/test/Makefile.regress index 31f767a1c49..c5e017e74a9 100644 --- a/src/interfaces/ecpg/test/Makefile.regress +++ b/src/interfaces/ecpg/test/Makefile.regress @@ -2,8 +2,8 @@ override CPPFLAGS := -I../../include -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS) override CFLAGS += $(PTHREAD_CFLAGS) -override LDFLAGS := -L../../ecpglib -L../../pgtypeslib -L../../../libpq $(LDFLAGS) -override LIBS := -lpgtypes -lecpg -lpq $(LIBS) $(PTHREAD_LIBS) +override LDFLAGS := -L../../ecpglib -L../../pgtypeslib $(LDFLAGS) +override LIBS := -lecpg -lpgtypes $(libpq) $(LIBS) $(PTHREAD_LIBS) ECPG = ../../preproc/ecpg -I$(srcdir)/../../include diff --git a/src/interfaces/ecpg/test/compat_informix/Makefile b/src/interfaces/ecpg/test/compat_informix/Makefile index 05ed3cfd8cc..f57a190c4bd 100644 --- a/src/interfaces/ecpg/test/compat_informix/Makefile +++ b/src/interfaces/ecpg/test/compat_informix/Makefile @@ -3,11 +3,12 @@ top_builddir = ../../../../.. include $(top_builddir)/src/Makefile.global include $(top_srcdir)/$(subdir)/../Makefile.regress -# special informix compatiblity switches +# special informix compatibility switches ECPG += -C INFORMIX ECPG_NOIND = $(ECPG) -r no_indicator -override LDFLAGS += -L../../compatlib -override LIBS += $(LIBS) -lecpg_compat + +override LDFLAGS := -L../../compatlib $(LDFLAGS) +override LIBS := -lecpg_compat $(LIBS) TESTS = test_informix test_informix.c \ test_informix2 test_informix2.c \ diff --git a/src/interfaces/ecpg/test/pg_regress.sh b/src/interfaces/ecpg/test/pg_regress.sh index a896042d53b..9f27d374d4e 100644 --- a/src/interfaces/ecpg/test/pg_regress.sh +++ b/src/interfaces/ecpg/test/pg_regress.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress.sh,v 1.13 2006/09/08 13:32:27 meskes Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress.sh,v 1.14 2006/09/19 15:36:08 tgl Exp $ me=`basename $0` @@ -322,6 +322,7 @@ do_temp_install(){ # Set up shared library paths, needed by psql and pg_encoding # (if you run multibyte). LD_LIBRARY_PATH covers many platforms. # DYLD_LIBRARY_PATH works on Darwin, and maybe other Mach-based systems. + # LIBPATH is for AIX. # Feel free to account for others as well. # ---------- @@ -339,6 +340,13 @@ do_temp_install(){ fi export DYLD_LIBRARY_PATH + if [ -n "$LIBPATH" ]; then + LIBPATH="$libdir:$LIBPATH" + else + LIBPATH=$libdir + fi + export LIBPATH + # ---------- # Windows needs shared libraries in PATH. (Only those linked into # executables, not dlopen'ed ones) |