Install the Octave libraries publically in /usr/lib/

Forwarded: not-needed
Reviewed-by: Rafael Laboissière <rafael@debian.org>
Last-Update: 2016-11-20

Thanks to John Eaton for helping with this.

The patch is currently not needed upstream, but forwarding it might make sense
in the future.

Gbp-Pq: Name install_libraries_publically.patch

diff --git a/Makefile.am b/Makefile.am
index 6d9f874c0c525c57b071fff0c6a57eafc01c2d61..cb0feae20be3edb911cb79f4f39913bacd8c6ebc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -184,6 +184,7 @@ OCTAVE_CROSS_TOOLS =
 OCTAVE_INTERPRETER_TARGETS =
 
 octlib_LTLIBRARIES =
+lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
 octinclude_HEADERS =

diff --git a/libinterp/module.mk b/libinterp/module.mk
index 433a8885b86938087b9dbf96692f10f48b2211ee..af09775e9a37978cc600498f6fa4edb576464ab9 100644 (file)
--- a/libinterp/module.mk
+++ b/libinterp/module.mk
@@ -24,7 +24,7 @@ LIBINTERP_DEFUN_FILES =
   $(HDF5_CPPFLAGS) \
   $(MAGICK_CPPFLAGS)
 
-octlib_LTLIBRARIES += %reldir%/liboctinterp.la
+lib_LTLIBRARIES += %reldir%/liboctinterp.la
 
 %canon_reldir%_pkgconfig_DATA = %reldir%/octinterp.pc
 

diff --git a/liboctave/module.mk b/liboctave/module.mk
index f1563552c63aaeaf64818d142b650d4846f1ff71..8d8c0509cdec780cd52c77fb634f5076c0e7dcc7 100644 (file)
--- a/liboctave/module.mk
+++ b/liboctave/module.mk
@@ -23,7 +23,7 @@ GEN_CONFIG_SHELL += \
   -I$(srcdir)/%reldir%/util \
   -I$(srcdir)/%reldir%/wrappers
 
-octlib_LTLIBRARIES += %reldir%/liboctave.la
+lib_LTLIBRARIES += %reldir%/liboctave.la
 
 %canon_reldir%_pkgconfig_DATA = %reldir%/octave.pc