/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2013-10-22 19:24:01 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131022192401-op6mwsb7f7gygjyh
* mandos (priority): Bug fix: Add even more magic to make the old
                     DSA/ELG 2048-bit keys work with GnuTLS.
* mandos-keygen (KEYCOMMENT): Changed default to "".
* mandos-keygen (OPTIONS): Document new default value of "--comment".
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 \
344
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
345
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
346
341
                mandos-keygen
 
342
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
343
                mandos-change-keytype
347
344
        install --mode=u=rwx,go=rx \
348
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
349
346
                plugins.d/password-prompt
412
409
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
413
410
                $(DESTDIR)/etc/crypttab
414
411
        -rm --force $(PREFIX)/sbin/mandos-keygen \
 
412
                $(PREFIX)/sbin/mandos-change-keytype \
415
413
                $(PREFIX)/lib/mandos/plugin-runner \
416
414
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
417
415
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
441
439
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
442
440
                $(DESTDIR)/etc/default/mandos \
443
441
                $(DESTDIR)/etc/init.d/mandos \
444
 
                $(SYSTEMD)/mandos.service \
445
 
                $(DESTDIR)/run/mandos.pid \
446
 
                $(DESTDIR)/var/run/mandos.pid
 
442
                $(DESTDIR)/run/mandos.pid
447
443
        -rmdir $(CONFDIR)
448
444
 
449
445
purge-client: uninstall-client