/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: 2014-02-16 02:42:42 UTC
  • Revision ID: teddy@recompile.se-20140216024242-9wiw1nkxgt7ohovj
Fix running of self-tests.

* debian/control (Build-Depends): Add Python dependencies to
                                  successfully run self-tests.
* debian/copyright: GPLv3 now has its own license file - use it.
* debian/watch: Set PGP signature URL.
* mandos (main): Bug fix: When running self-tests, set exit code.
* mandos-ctl (main): Cosmetic fix; use os.EX_OK instead of plain 0.

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.2
 
26
version=1.6.3
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
36
36
# MANDIR=$(PREFIX)/man
37
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
39
# LIBDIR=$(PREFIX)/lib
39
40
##
40
41
 
41
42
## These settings are for a package-type install
45
46
MANDIR=$(PREFIX)/share/man
46
47
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
48
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)
48
58
##
49
59
 
50
60
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
294
304
 
295
305
install-server: doc
296
306
        install --directory $(CONFDIR)
297
 
        install --directory --mode=u=rwx --owner=$(USER) \
298
 
                --group=$(GROUP) $(STATEDIR)
 
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
299
313
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
300
314
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
301
315
                mandos-ctl
331
345
                > $(MANDIR)/man8/intro.8mandos.gz
332
346
 
333
347
install-client-nokey: all doc
334
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
348
        install --directory $(LIBDIR)/mandos $(CONFDIR)
335
349
        install --directory --mode=u=rwx $(KEYDIR) \
336
 
                $(PREFIX)/lib/mandos/plugins.d
337
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
350
                $(LIBDIR)/mandos/plugins.d
 
351
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
338
352
                install --mode=u=rwx \
339
353
                        --directory "$(CONFDIR)/plugins.d"; \
340
354
        fi
341
355
        install --mode=u=rwx,go=rx --directory \
342
356
                "$(CONFDIR)/network-hooks.d"
343
357
        install --mode=u=rwx,go=rx \
344
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
358
                --target-directory=$(LIBDIR)/mandos plugin-runner
345
359
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
346
360
                mandos-keygen
347
361
        install --mode=u=rwx,go=rx \
348
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
362
                --target-directory=$(LIBDIR)/mandos/plugins.d \
349
363
                plugins.d/password-prompt
350
364
        install --mode=u=rwxs,go=rx \
351
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
365
                --target-directory=$(LIBDIR)/mandos/plugins.d \
352
366
                plugins.d/mandos-client
353
367
        install --mode=u=rwxs,go=rx \
354
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
368
                --target-directory=$(LIBDIR)/mandos/plugins.d \
355
369
                plugins.d/usplash
356
370
        install --mode=u=rwxs,go=rx \
357
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
371
                --target-directory=$(LIBDIR)/mandos/plugins.d \
358
372
                plugins.d/splashy
359
373
        install --mode=u=rwxs,go=rx \
360
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
374
                --target-directory=$(LIBDIR)/mandos/plugins.d \
361
375
                plugins.d/askpass-fifo
362
376
        install --mode=u=rwxs,go=rx \
363
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
377
                --target-directory=$(LIBDIR)/mandos/plugins.d \
364
378
                plugins.d/plymouth
365
379
        install initramfs-tools-hook \
366
380
                $(INITRAMFSTOOLS)/hooks/mandos
412
426
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
413
427
                $(DESTDIR)/etc/crypttab
414
428
        -rm --force $(PREFIX)/sbin/mandos-keygen \
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 \
 
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 \
422
436
                $(INITRAMFSTOOLS)/hooks/mandos \
423
437
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
424
438
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
430
444
                $(MANDIR)/man8/splashy.8mandos.gz \
431
445
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
432
446
                $(MANDIR)/man8/plymouth.8mandos.gz \
433
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
434
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
447
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
448
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
435
449
        update-initramfs -k all -u
436
450
 
437
451
purge: purge-server purge-client