Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-1884-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240214-hook-fixup-v1-0-0e158ffea140@gmail.com> <20240214-hook-fixup-v1-1-0e158ffea140@gmail.com>
In-Reply-To: <20240214-hook-fixup-v1-1-0e158ffea140@gmail.com>
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date: Wed, 14 Feb 2024 17:23:43 -0500
Message-ID: <CABBYNZJE6h9MKo8Eyh9SNyYWBSH9Kq6q5o3bcH-wEb41QXaAvw@mail.gmail.com>
Subject: Re: [PATCH BlueZ 1/4] build: fold separate install-data-hooks
To: emil.l.velikov@gmail.com
Cc: linux-bluetooth@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Emil,

On Wed, Feb 14, 2024 at 5:02=E2=80=AFPM Emil Velikov via B4 Relay
<devnull+emil.l.velikov.gmail.com@kernel.org> wrote:
>
> From: Emil Velikov <emil.l.velikov@gmail.com>
>
> Autoconfigure throws a useful error, that I've missed previously. As-is
> with two identical hooks `make install` will fail.
>
> Just fold them into single place - not particularly pretty but works.
>
> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
> ---
>  Makefile.am    | 9 +++++++++
>  Makefile.obexd | 6 ------
>  2 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 5207c172b..e67551761 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -34,6 +34,15 @@ statedir =3D $(localstatedir)/lib/bluetooth
>  install-data-hook:
>         install -dm555 $(DESTDIR)$(confdir)
>         install -dm700 $(DESTDIR)$(statedir)
> +if OBEX
> +if SYSTEMD
> +       $(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org=
.bluez.obex.service
> +
> +uninstall-hook:
> +       rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.servic=
e
> +endif
> +endif
> +
>  if DATAFILES
>  dbusdir =3D $(DBUS_CONFDIR)/dbus-1/system.d
> diff --git a/Makefile.obexd b/Makefile.obexd
> index 81456544d..b91ca6644 100644
> --- a/Makefile.obexd
> +++ b/Makefile.obexd
> @@ -2,12 +2,6 @@
>  if SYSTEMD
>  systemduserunitdir =3D $(SYSTEMD_USERUNITDIR)
>  systemduserunit_DATA =3D obexd/src/obex.service
> -
> -install-data-hook:
> -       $(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org=
.bluez.obex.service
> -
> -uninstall-hook:
> -       rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.servic=
e
>  endif

Hmm, isn't it possible to do target specific install hooks?

>  dbussessionbusdir =3D $(DBUS_SESSIONBUSDIR)
>
> --
> 2.43.1
>
>


--=20
Luiz Augusto von Dentz