From 8bc6dc2a65769b59721f759ce506c38431abcc3e Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 26 Jan 2012 22:06:02 -0800
Subject: [PATCH] Move PSPP shared libraries from $(libdir) to $(libdir)/pspp.

The PSPP shared libraries do not have a stable ABI and so they
should not go in a public system library directory.  This moves
them to a private library subdirectory.
---
 configure.ac            | 2 +-
 perl-module/automake.mk | 8 +++++---
 src/automake.mk         | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce508eec..04d22d62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,7 +342,7 @@ LIBS="$LIBICONV $LIBS"
 
 dnl Required by the gnulib 'relocatable-prog' module.
 dnl See doc/relocatable-maint.texi in the gnulib tree for details.
-RELOCATABLE_LIBRARY_PATH='$(libdir)'
+RELOCATABLE_LIBRARY_PATH='$(pkglibdir)'
 RELOCATABLE_STRIP=:
 
 PSPP_CHECK_PREREQS
diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 93b9bc0e..f09923f1 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -15,6 +15,8 @@ module_sources = \
  perl-module/lib/PSPP.pm \
  perl-module/t/Pspp.t
 
+MAKE_PERL = $(MAKE) $(AM_MAKEFLAGS) LD_RUN_PATH=$(pkglibdir)
+
 perl-module/pspp-module-config: Makefile
 	(echo '%Locations = (';\
 	 printf "  SourceDir => '";\
@@ -28,11 +30,11 @@ perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config $(m
 
 perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
 	rm -f $@
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
+	cd perl-module && $(MAKE_PERL) tardist
 
 PHONY += module-make
 module-make: perl-module/Makefile
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
+	cd perl-module && $(MAKE_PERL)
 
 ALL_LOCAL += perl_module_tarball
 perl_module_tarball: $(module_sources) src/libpspp-core.la
@@ -47,7 +49,7 @@ perl_module_tarball: $(module_sources) src/libpspp-core.la
 	  fi ; \
 	 done \
 	fi
-	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
+	$(MAKE_PERL) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
 
 CLEAN_LOCAL += perl_module_clean
 perl_module_clean:
diff --git a/src/automake.mk b/src/automake.mk
index 3f56eb5c..73ff8136 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -10,7 +10,7 @@ include $(top_srcdir)/src/data/automake.mk
 AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/lib
 
 
-lib_LTLIBRARIES = src/libpspp-core.la src/libpspp.la
+pkglib_LTLIBRARIES = src/libpspp-core.la src/libpspp.la
 src_libpspp_core_la_SOURCES = 
 
 
-- 
2.30.2