/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-01-06 16:01:46 UTC
  • Revision ID: teddy@recompile.se-20140106160146-v5gnpwf0vidfz7h7
Minor code fix; raise only exception instances, not classes.

* mandos (DBusObjectWithProperties.Set): Add error message if raising
                                         ValueError (should never
                                         happen anyway).

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)))
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
 
 
60
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
61
 
50
62
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
63
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
64
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
292
304
 
293
305
install-server: doc
294
306
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --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
297
313
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
314
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
315
                mandos-ctl
307
323
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
324
        install --mode=u=rwx,go=rx init.d-mandos \
309
325
                $(DESTDIR)/etc/init.d/mandos
 
326
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
327
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
328
        fi
310
329
        install --mode=u=rw,go=r default-mandos \
311
330
                $(DESTDIR)/etc/default/mandos
312
331
        if [ -z $(DESTDIR) ]; then \
326
345
                > $(MANDIR)/man8/intro.8mandos.gz
327
346
 
328
347
install-client-nokey: all doc
329
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
348
        install --directory $(LIBDIR)/mandos $(CONFDIR)
330
349
        install --directory --mode=u=rwx $(KEYDIR) \
331
 
                $(PREFIX)/lib/mandos/plugins.d
332
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
350
                $(LIBDIR)/mandos/plugins.d
 
351
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
333
352
                install --mode=u=rwx \
334
353
                        --directory "$(CONFDIR)/plugins.d"; \
335
354
        fi
336
355
        install --mode=u=rwx,go=rx --directory \
337
356
                "$(CONFDIR)/network-hooks.d"
338
357
        install --mode=u=rwx,go=rx \
339
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
358
                --target-directory=$(LIBDIR)/mandos plugin-runner
340
359
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
360
                mandos-keygen
342
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
343
 
                mandos-change-keytype
344
361
        install --mode=u=rwx,go=rx \
345
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
362
                --target-directory=$(LIBDIR)/mandos/plugins.d \
346
363
                plugins.d/password-prompt
347
364
        install --mode=u=rwxs,go=rx \
348
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
365
                --target-directory=$(LIBDIR)/mandos/plugins.d \
349
366
                plugins.d/mandos-client
350
367
        install --mode=u=rwxs,go=rx \
351
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
368
                --target-directory=$(LIBDIR)/mandos/plugins.d \
352
369
                plugins.d/usplash
353
370
        install --mode=u=rwxs,go=rx \
354
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
371
                --target-directory=$(LIBDIR)/mandos/plugins.d \
355
372
                plugins.d/splashy
356
373
        install --mode=u=rwxs,go=rx \
357
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
374
                --target-directory=$(LIBDIR)/mandos/plugins.d \
358
375
                plugins.d/askpass-fifo
359
376
        install --mode=u=rwxs,go=rx \
360
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
377
                --target-directory=$(LIBDIR)/mandos/plugins.d \
361
378
                plugins.d/plymouth
362
379
        install initramfs-tools-hook \
363
380
                $(INITRAMFSTOOLS)/hooks/mandos
409
426
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
410
427
                $(DESTDIR)/etc/crypttab
411
428
        -rm --force $(PREFIX)/sbin/mandos-keygen \
412
 
                $(PREFIX)/sbin/mandos-change-keytype \
413
 
                $(PREFIX)/lib/mandos/plugin-runner \
414
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
415
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
416
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
417
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
418
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
419
 
                $(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 \
420
436
                $(INITRAMFSTOOLS)/hooks/mandos \
421
437
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
422
438
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
428
444
                $(MANDIR)/man8/splashy.8mandos.gz \
429
445
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
430
446
                $(MANDIR)/man8/plymouth.8mandos.gz \
431
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
432
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
447
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
448
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
433
449
        update-initramfs -k all -u
434
450
 
435
451
purge: purge-server purge-client
439
455
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
440
456
                $(DESTDIR)/etc/default/mandos \
441
457
                $(DESTDIR)/etc/init.d/mandos \
442
 
                $(DESTDIR)/run/mandos.pid
 
458
                $(SYSTEMD)/mandos.service \
 
459
                $(DESTDIR)/run/mandos.pid \
 
460
                $(DESTDIR)/var/run/mandos.pid
443
461
        -rmdir $(CONFDIR)
444
462
 
445
463
purge-client: uninstall-client