/mandos/release

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2016-03-19 12:10:15 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 341.
  • Revision ID: teddy@recompile.se-20160319121015-ywrw6qx3srtj2dix
Server: Debian package bug fix: Include /usr/lib/tmpfiles.d dir

The Debian package for the server needs the /usr/lib/tmpfiles.d
directory in its .dirs file in order for the directory to exist when
the Makefile "install-server" rule is run, otherwise the
tmpfiles.d-mandos.conf file will not be installed.

* debian/mandos.dirs (usr/lib/tmpfiles.d): Added.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
40
40
OPTIMIZE=-Os -fno-strict-aliasing
41
41
LANGUAGE=-std=gnu11
42
42
htmldir=man
43
 
version=1.7.3
 
43
version=1.7.6
44
44
SED=sed
45
45
 
46
46
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
75
75
##
76
76
 
77
77
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
78
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
78
79
 
79
80
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
80
81
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
337
338
        elif install --directory --mode=u=rwx $(STATEDIR); then \
338
339
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
339
340
        fi
 
341
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
342
                install --mode=u=rwx,go=r tmpfiles.d-mandos.conf \
 
343
                        $(TMPFILES)/mandos.conf; \
 
344
        fi
340
345
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
341
346
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
342
347
                mandos-ctl
378
383
                $(LIBDIR)/mandos/plugin-helpers
379
384
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
380
385
                install --mode=u=rwx \
381
 
                        --directory "$(CONFDIR)/plugins.d"; \
382
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
 
386
                        --directory "$(CONFDIR)/plugins.d" \
 
387
                        "$(CONFDIR)/plugin-helpers"; \
383
388
        fi
384
389
        install --mode=u=rwx,go=rx --directory \
385
390
                "$(CONFDIR)/network-hooks.d"
405
410
        install --mode=u=rwxs,go=rx \
406
411
                --target-directory=$(LIBDIR)/mandos/plugins.d \
407
412
                plugins.d/plymouth
408
 
        install --mode=u=rwxs,go=rx \
 
413
        install --mode=u=rwx,go=rx \
409
414
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
410
415
                plugin-helpers/mandos-client-iprouteadddel
411
416
        install initramfs-tools-hook \