/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)
304
294
 
305
295
install-server: doc
306
296
        install --directory $(CONFDIR)
307
 
        if install --directory --mode=u=rwx --owner=$(USER) \
308
 
                --group=$(GROUP) $(STATEDIR); then \
309
 
                :; \
310
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
311
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
312
 
        fi
 
297
        install --directory --mode=u=rwx --owner=$(USER) \
 
298
                --group=$(GROUP) $(STATEDIR)
313
299
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
314
300
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
315
301
                mandos-ctl
345
331
                > $(MANDIR)/man8/intro.8mandos.gz
346
332
 
347
333
install-client-nokey: all doc
348
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
334
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
349
335
        install --directory --mode=u=rwx $(KEYDIR) \
350
 
                $(LIBDIR)/mandos/plugins.d
351
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
336
                $(PREFIX)/lib/mandos/plugins.d
 
337
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
352
338
                install --mode=u=rwx \
353
339
                        --directory "$(CONFDIR)/plugins.d"; \
354
340
        fi
355
341
        install --mode=u=rwx,go=rx --directory \
356
342
                "$(CONFDIR)/network-hooks.d"
357
343
        install --mode=u=rwx,go=rx \
358
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
344
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
359
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
360
346
                mandos-keygen
361
347
        install --mode=u=rwx,go=rx \
362
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
348
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
363
349
                plugins.d/password-prompt
364
350
        install --mode=u=rwxs,go=rx \
365
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
351
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
366
352
                plugins.d/mandos-client
367
353
        install --mode=u=rwxs,go=rx \
368
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
354
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
369
355
                plugins.d/usplash
370
356
        install --mode=u=rwxs,go=rx \
371
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
357
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
372
358
                plugins.d/splashy
373
359
        install --mode=u=rwxs,go=rx \
374
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
360
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
375
361
                plugins.d/askpass-fifo
376
362
        install --mode=u=rwxs,go=rx \
377
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
363
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
378
364
                plugins.d/plymouth
379
365
        install initramfs-tools-hook \
380
366
                $(INITRAMFSTOOLS)/hooks/mandos
426
412
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
427
413
                $(DESTDIR)/etc/crypttab
428
414
        -rm --force $(PREFIX)/sbin/mandos-keygen \
429
 
                $(LIBDIR)/mandos/plugin-runner \
430
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
431
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
432
 
                $(LIBDIR)/mandos/plugins.d/usplash \
433
 
                $(LIBDIR)/mandos/plugins.d/splashy \
434
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
435
 
                $(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 \
436
422
                $(INITRAMFSTOOLS)/hooks/mandos \
437
423
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
438
424
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
444
430
                $(MANDIR)/man8/splashy.8mandos.gz \
445
431
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
446
432
                $(MANDIR)/man8/plymouth.8mandos.gz \
447
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
448
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
433
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
434
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
449
435
        update-initramfs -k all -u
450
436
 
451
437
purge: purge-server purge-client