/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2023-02-12 17:49:24 UTC
  • Revision ID: teddy@recompile.se-20230212174924-y7fnckjje5xsd9lb
Move D-Bus policy file to /usr/share/dbus-1/session.d

According to dbus-daeemon(1), the correct place for D-Bus policy files
is not "/etc/dbus-1/session.d" but "/usr/share/dbus-1/session.d" (and
Lintian 2.116.0 warns about this).  Therefore, move the file.

* Makefile (DBUSPOLICYDIR): New; set to
  "$(DESTDIR)/usr/share/dbus-1/system.d".
  (install-server): Use $(DBUSPOLICYDIR).
* debian/mandos.dirs (etc/dbus-1/system.d): Remove.
  (usr/share/dbus-1/system.d): New.
* debian/mandos.maintscript: New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
64
64
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
65
65
# STATEDIR:=$(DESTDIR)/var/lib/mandos
66
66
# LIBDIR:=$(PREFIX)/lib
 
67
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
67
68
##
68
69
 
69
70
## These settings are for a package-type install
84
85
                        break; \
85
86
                fi; \
86
87
        done)
 
88
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
87
89
##
88
90
 
89
91
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
421
423
        install --mode=u=rw --target-directory=$(CONFDIR) \
422
424
                clients.conf
423
425
        install --mode=u=rw,go=r dbus-mandos.conf \
424
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
426
                $(DBUSPOLICYDIR)/mandos.conf
425
427
        install --mode=u=rwx,go=rx init.d-mandos \
426
428
                $(DESTDIR)/etc/init.d/mandos
427
429
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \