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.

diff --git a/configure.ac b/configure.ac
index ce508eec588fa7e61fb23bef55ffc79dd9dbc32d..04d22d624d5a25b7d2b6cc583e08cb2696d2a37c 100644 (file)
--- 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 93b9bc0ec1887459c7f6e6212665e585a9e75a6f..f09923f137f836717bba4eec0f48fd2f8877809c 100644 (file)
--- 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 3f56eb5c792289e1aad567cb5492ee963ce2fe39..73ff8136ff3fe7361dbd98d0251faeaee1111a24 100644 (file)
--- 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 =