Hi Emil, On Wed, Feb 14, 2024 at 5:02 PM Emil Velikov via B4 Relay <devnull+emil.l.velikov.gmail.com@xxxxxxxxxx> wrote: > > From: Emil Velikov <emil.l.velikov@xxxxxxxxx> > > 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@xxxxxxxxx> > --- > 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 = $(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.service > +endif > +endif > + > if DATAFILES > dbusdir = $(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 = $(SYSTEMD_USERUNITDIR) > systemduserunit_DATA = 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.service > endif Hmm, isn't it possible to do target specific install hooks? > dbussessionbusdir = $(DBUS_SESSIONBUSDIR) > > -- > 2.43.1 > > -- Luiz Augusto von Dentz
