[PATCH] Fix installations to pkglibexecdir

[PATCH] Fix installations to pkglibexecdir

[Ludwig Nussel]

In 78bce4800 pkglibexecdir was used instead of libexecdir. Make sure
Makefile and service files match, so install to pkglibexecdir actually.
---
 Makefile.am    | 4 ++--
 Makefile.mesh  | 2 +-
 Makefile.obexd | 2 +-
 Makefile.tools | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f84a1faba..33baa66ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST =
 
 pkglibexecdir = $(libexecdir)/bluetooth
 
-libexec_PROGRAMS =
+pkglibexec_PROGRAMS =
 
 pkgincludedir = $(includedir)/bluetooth
 
@@ -238,7 +238,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 76e424b92..12653ccb1 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh
@@ -26,7 +26,7 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \
 				mesh/prov-acceptor.c mesh/prov-initiator.c \
 				mesh/pb-adv.h mesh/pb-adv.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
-- 
2.16.4

Re: [PATCH] Fix installations to pkglibexecdir

[Stotland, Inga]

[-- Attachment #1: Type: text/plain, Size: 3296 bytes --]

Hi Ludwig,

On Fri, 2019-04-12 at 16:07 +0200, Ludwig Nussel wrote:
> In 78bce4800 pkglibexecdir was used instead of libexecdir. Make sure
> Makefile and service files match, so install to pkglibexecdir
> actually.

Could we please rephrase it here slightly:
In 78bce4800 libexecdir was switched to pkglibexecdir. To use the
matching installation script, use pkglibexec_Programs instead of
libexec_Programs.

> ---
>  Makefile.am    | 4 ++--
>  Makefile.mesh  | 2 +-
>  Makefile.obexd | 2 +-
>  Makefile.tools | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index f84a1faba..33baa66ff 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -22,7 +22,7 @@ EXTRA_DIST =
>  
>  pkglibexecdir = $(libexecdir)/bluetooth
>  
> -libexec_PROGRAMS =
> +pkglibexec_PROGRAMS =
>  
>  pkgincludedir = $(includedir)/bluetooth
>  
> @@ -238,7 +238,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 76e424b92..12653ccb1 100644
> --- a/Makefile.mesh
> +++ b/Makefile.mesh
> @@ -26,7 +26,7 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \
>  				mesh/prov-acceptor.c mesh/prov-
> initiator.c \
>  				mesh/pb-adv.h mesh/pb-adv.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

Thanks for submitting the fix.
I am guessing ther reason that your email went unnoticed for so long is
that the subject line doesn't have the correct prefix, i.e., [PATCH
BlueZ]. This  prefix has to be used to get attention of BlueZ
maintainers.

Could you please rebase the change (it's been sitting a bit too long
and now has conflicts) and modify the commit title to be prefaced with
"build:" to indicate which part of BlueZ is affected, i.e., something
like:
"build: Fix installation to use pkglibexec_Programs"

Best regards,

Inga

[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3265 bytes --]