aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2004-11-19 19:23:01 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2004-11-19 19:23:01 +0000
commit466fb0673956196224b832a71715158b3105e3b0 (patch)
treef25781092f7367f31b47bc17cb1d4645942d9494
parenta9ddd649df46afde8f26dd9f85f05292e8da1f4b (diff)
downloadpostgresql-466fb0673956196224b832a71715158b3105e3b0.tar.gz
postgresql-466fb0673956196224b832a71715158b3105e3b0.zip
Set rpath for plperl and plpython to ensure we can find the .so files
for the languages even when not installed in a standard directory. pltcl may need this treatment as well, but we don't have the right path conveniently available, so I'll leave it alone as long as there aren't actual reports of trouble.
-rw-r--r--src/pl/plperl/GNUmakefile4
-rw-r--r--src/pl/plpython/Makefile5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 2a5392405cb..eb633d400b0 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -1,5 +1,5 @@
# Makefile for PL/Perl
-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.17 2004/11/17 21:23:36 tgl Exp $
+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.18 2004/11/19 19:22:58 tgl Exp $
subdir = src/pl/plperl
top_builddir = ../../..
@@ -25,6 +25,8 @@ endif
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE
+rpathdir = $(perl_archlibexp)/CORE
+
NAME = plperl
SO_MAJOR_VERSION = 0
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 5987e817b1a..f2793d9ed06 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.17 2004/10/11 19:32:19 tgl Exp $
+# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.18 2004/11/19 19:23:01 tgl Exp $
subdir = src/pl/plpython
top_builddir = ../../..
@@ -33,7 +33,8 @@ endif
ifneq (,$(findstring yes, $(shared_libpython)$(allow_nonpic_in_shlib)))
override CPPFLAGS := -I$(srcdir) $(python_includespec) $(CPPFLAGS)
-rpath :=
+
+rpathdir = $(python_libdir)
NAME = plpython
SO_MAJOR_VERSION = 0