/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
36
36
# MANDIR=$(PREFIX)/man
37
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
 
# LIBDIR=$(PREFIX)/lib
40
39
##
41
40
 
42
41
## These settings are for a package-type install
46
45
MANDIR=$(PREFIX)/share/man
47
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
48
47
STATEDIR=$(DESTDIR)/var/lib/mandos
49
 
LIBDIR=$(shell \
50
 
        for d in \
51
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
52
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
53
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
54
 
                        echo "$(DESTDIR)$$d"; \
55
 
                        break; \
56
 
                fi; \
57
 
        done)
58
48
##
59
49
 
60
50
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
341
331
                > $(MANDIR)/man8/intro.8mandos.gz
342
332
 
343
333
install-client-nokey: all doc
344
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
334
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
345
335
        install --directory --mode=u=rwx $(KEYDIR) \
346
 
                $(LIBDIR)/mandos/plugins.d
347
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
336
                $(PREFIX)/lib/mandos/plugins.d
 
337
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
348
338
                install --mode=u=rwx \
349
339
                        --directory "$(CONFDIR)/plugins.d"; \
350
340
        fi
351
341
        install --mode=u=rwx,go=rx --directory \
352
342
                "$(CONFDIR)/network-hooks.d"
353
343
        install --mode=u=rwx,go=rx \
354
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
344
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
355
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
356
346
                mandos-keygen
357
347
        install --mode=u=rwx,go=rx \
358
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
348
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
359
349
                plugins.d/password-prompt
360
350
        install --mode=u=rwxs,go=rx \
361
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
351
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
362
352
                plugins.d/mandos-client
363
353
        install --mode=u=rwxs,go=rx \
364
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
354
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
365
355
                plugins.d/usplash
366
356
        install --mode=u=rwxs,go=rx \
367
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
357
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
368
358
                plugins.d/splashy
369
359
        install --mode=u=rwxs,go=rx \
370
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
360
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
371
361
                plugins.d/askpass-fifo
372
362
        install --mode=u=rwxs,go=rx \
373
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
363
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
374
364
                plugins.d/plymouth
375
365
        install initramfs-tools-hook \
376
366
                $(INITRAMFSTOOLS)/hooks/mandos
422
412
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
423
413
                $(DESTDIR)/etc/crypttab
424
414
        -rm --force $(PREFIX)/sbin/mandos-keygen \
425
 
                $(LIBDIR)/mandos/plugin-runner \
426
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
427
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
428
 
                $(LIBDIR)/mandos/plugins.d/usplash \
429
 
                $(LIBDIR)/mandos/plugins.d/splashy \
430
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
431
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
415
                $(PREFIX)/lib/mandos/plugin-runner \
 
416
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
417
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
418
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
419
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
420
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
421
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
432
422
                $(INITRAMFSTOOLS)/hooks/mandos \
433
423
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
434
424
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
440
430
                $(MANDIR)/man8/splashy.8mandos.gz \
441
431
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
442
432
                $(MANDIR)/man8/plymouth.8mandos.gz \
443
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
444
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
433
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
434
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
445
435
        update-initramfs -k all -u
446
436
 
447
437
purge: purge-server purge-client