/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: 2013-10-27 17:42:23 UTC
  • Revision ID: teddy@recompile.se-20131027174223-mq3a1h8xi5jcv9e6
Bug fix: Make sure systemd service file is installed.

* Makefile (install-server): Fix typo causing syntax error.
* debian/mandos.dirs (lib/systemd/system): New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.6.1
 
26
version=1.6.2
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
47
47
STATEDIR=$(DESTDIR)/var/lib/mandos
48
48
##
49
49
 
 
50
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
51
 
50
52
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
53
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
54
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
307
309
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
310
        install --mode=u=rwx,go=rx init.d-mandos \
309
311
                $(DESTDIR)/etc/init.d/mandos
 
312
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
313
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
314
        fi
310
315
        install --mode=u=rw,go=r default-mandos \
311
316
                $(DESTDIR)/etc/default/mandos
312
317
        if [ -z $(DESTDIR) ]; then \
339
344
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
340
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
346
                mandos-keygen
342
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
343
 
                mandos-change-keytype
344
347
        install --mode=u=rwx,go=rx \
345
348
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
346
349
                plugins.d/password-prompt
409
412
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
410
413
                $(DESTDIR)/etc/crypttab
411
414
        -rm --force $(PREFIX)/sbin/mandos-keygen \
412
 
                $(PREFIX)/sbin/mandos-change-keytype \
413
415
                $(PREFIX)/lib/mandos/plugin-runner \
414
416
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
415
417
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
439
441
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
440
442
                $(DESTDIR)/etc/default/mandos \
441
443
                $(DESTDIR)/etc/init.d/mandos \
442
 
                $(DESTDIR)/run/mandos.pid
 
444
                $(SYSTEMD)/mandos.service \
 
445
                $(DESTDIR)/run/mandos.pid \
 
446
                $(DESTDIR)/var/run/mandos.pid
443
447
        -rmdir $(CONFDIR)
444
448
 
445
449
purge-client: uninstall-client