/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-20 19:13:09 UTC
  • Revision ID: teddy@recompile.se-20131020191309-7tyca3oo0zqxn45s
* mandos-keygen: Bug fix: Specify key usage to avoid creating keys
                 with key usage flags which GnuTLS does not like.
                 Also fix --help output documentation about default
                 subkey type.

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.1
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
 
 
52
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
53
51
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
54
52
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
309
307
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
310
308
        install --mode=u=rwx,go=rx init.d-mandos \
311
309
                $(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
315
310
        install --mode=u=rw,go=r default-mandos \
316
311
                $(DESTDIR)/etc/default/mandos
317
312
        if [ -z $(DESTDIR) ]; then \
441
436
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
442
437
                $(DESTDIR)/etc/default/mandos \
443
438
                $(DESTDIR)/etc/init.d/mandos \
444
 
                $(SYSTEMD)/mandos.service \
445
 
                $(DESTDIR)/run/mandos.pid \
446
 
                $(DESTDIR)/var/run/mandos.pid
 
439
                $(DESTDIR)/run/mandos.pid
447
440
        -rmdir $(CONFDIR)
448
441
 
449
442
purge-client: uninstall-client