diff options
| author | Ludwig Nussel <ludwig.nussel@suse.de> | 2019-04-12 16:07:41 +0200 |
|---|---|---|
| committer | Brian Gix <brian.gix@intel.com> | 2019-06-04 13:25:54 -0700 |
| commit | d2a72dd6710cd43fe5930664e8eb2c7aa97482e7 (patch) | |
| tree | 46d7978fbb48ffc82d8ec81c41157f39265e8648 | |
| parent | 8de73cd12bfb99beeaabbbf5a316a1e5d6487260 (diff) | |
| download | bluez-d2a72dd6710cd43fe5930664e8eb2c7aa97482e7.tar.gz | |
install: Fix installations to pkglibexecdir
In 78bce4800 libexecdir was switched to pkglibexecdir. To use the
matching installation script, use pkglibexec_Programs instead of
libexec_Programs.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.mesh | 2 | ||||
| -rw-r--r-- | Makefile.obexd | 2 | ||||
| -rw-r--r-- | Makefile.tools | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 2583fbdd9..9d25a815b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ EXTRA_DIST = pkglibexecdir = $(libexecdir)/bluetooth -libexec_PROGRAMS = +pkglibexec_PROGRAMS = pkgincludedir = $(includedir)/bluetooth @@ -242,7 +242,7 @@ plugins_external_dummy_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \ plugins_external_dummy_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden endif -libexec_PROGRAMS += src/bluetoothd +pkglibexec_PROGRAMS += src/bluetoothd src_bluetoothd_SOURCES = $(builtin_sources) \ $(attrib_sources) $(btio_sources) \ diff --git a/Makefile.mesh b/Makefile.mesh index d494287ab..8dacc104c 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -28,7 +28,7 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \ mesh/pb-adv.h mesh/pb-adv.c \ mesh/keyring.h mesh/keyring.c \ mesh/mesh-defs.h -libexec_PROGRAMS += mesh/bluetooth-meshd +pkglibexec_PROGRAMS += mesh/bluetooth-meshd mesh_bluetooth_meshd_SOURCES = $(mesh_sources) mesh/main.c mesh_bluetooth_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c diff --git a/Makefile.obexd b/Makefile.obexd index 1c1e500fe..d36874770 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -51,7 +51,7 @@ obexd_builtin_modules += mns obexd_builtin_sources += obexd/client/mns.c obexd/src/map_ap.h \ obexd/client/map-event.h -libexec_PROGRAMS += obexd/src/obexd +pkglibexec_PROGRAMS += obexd/src/obexd obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ $(obexd_builtin_sources) \ diff --git a/Makefile.tools b/Makefile.tools index 379e127b6..7d5361bcd 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -43,7 +43,7 @@ monitor_btmon_LDADD = lib/libbluetooth-internal.la \ endif if LOGGER -libexec_PROGRAMS += tools/btmon-logger +pkglibexec_PROGRAMS += tools/btmon-logger tools_btmon_logger_SOURCES = tools/btmon-logger.c tools_btmon_logger_LDADD = src/libshared-mainloop.la |