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 3f196217b4a8742fae15876605775520ca97add1..bedadf988a7899fef57212b96cf3db3763299f51 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,6 +191,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 1a0786523fc0f8e000e65210c3a807d01a10440f..d13c4ad57ed54fa7cec6c200b14c42afc30fa87b 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 55d5e4afc76a0771ce82dd894c4e78688062df42..bfc9d82e92dfc11bab61b2d4662cff374dc8193f 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