kopia lustrzana https://gitlab.com/sane-project/backends
backend/Makefile: Fix installation of backend libraries
When using Automake variables like sanelib* to install files in a custom directory, the files are assumed to be platform-independent, unless these variables contain "exec" in the name. This affects whether the files are installed during "make install-data" or "make install-exec". It does not matter whether a suffix like _DATA or _LTLIBRARIES is added to this name. The packaging scripts for Debian call those Makefile targets separately and are affected by this behavior. Since the backend libraries themselves are platform-dependent files, rename these variables to execsanelib*.merge-requests/690/head
rodzic
e1f1273d23
commit
ba07a8a7f5
|
@ -109,9 +109,9 @@ install-data-hook: install-becfg install-firmware-path $(INSTALL_LOCKPATH)
|
||||||
# are not lost.
|
# are not lost.
|
||||||
install-becfg: becfg
|
install-becfg: becfg
|
||||||
@# Libtool has a bug where it will sometimes symlink the last
|
@# Libtool has a bug where it will sometimes symlink the last
|
||||||
@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
|
@# installed library in $(execsanelibdir) to libsane.*, which
|
||||||
@# Having two libsane's can cause issues so get rid of it.
|
@# causes a conflict with the actual libsane.* in $(libdir).
|
||||||
-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
|
-rm -f $(DESTDIR)$(execsanelibdir)/libsane.*
|
||||||
test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
|
test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
|
||||||
test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
|
test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
|
||||||
@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
|
@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
|
||||||
|
@ -225,8 +225,11 @@ EXTRA_LTLIBRARIES = $(be_convenience_libs) $(be_dlopen_libs)
|
||||||
|
|
||||||
lib_LTLIBRARIES = libsane.la
|
lib_LTLIBRARIES = libsane.la
|
||||||
|
|
||||||
sanelibdir = $(libdir)/sane
|
# The libraries in $(libdir)/sane are platform-dependent files, so they
|
||||||
sanelib_LTLIBRARIES = $(BACKEND_LIBS_ENABLED) libsane-dll.la
|
# should be installed during "make install-exec". For that reason, the
|
||||||
|
# variable names here must contain "exec".
|
||||||
|
execsanelibdir = $(libdir)/sane
|
||||||
|
execsanelib_LTLIBRARIES = $(BACKEND_LIBS_ENABLED) libsane-dll.la
|
||||||
|
|
||||||
COMMON_LIBS = ../lib/liblib.la $(XML_LIBS)
|
COMMON_LIBS = ../lib/liblib.la $(XML_LIBS)
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue