/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: 2008-09-02 17:42:53 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080902174253-p3wxrq7z6ccnv7fs
* plugins.d/password-request.c (main): Change default GnuTLS priority
                                       string to
                             "SECURE256":!CTYPE-X.509:+CTYPE-OPENPGP".

* plugins.d/password-request.xml (DESCRIPTION): Improve wording.
  (PURPOSE, OVERVIEW): New sections.
  (OPTIONS): Improved wording.
  (EXIT STATUS): Add text.
  (ENVIRONMENT): Commented out.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
14
14
OPTIMIZE=-Os
15
15
LANGUAGE=-std=gnu99
16
16
# PREFIX=/usr/local
17
 
PREFIX=/usr
 
17
PREFIX=$(DESTDIR)/usr
18
18
# CONFDIR=/usr/local/lib/mandos
19
 
CONFDIR=/etc/mandos
 
19
CONFDIR=$(DESTDIR)/etc/mandos
20
20
# MANDIR=/usr/local/man
21
 
MANDIR=/usr/share/man
 
21
MANDIR=$(DESTDIR)/usr/share/man
22
22
 
23
23
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
24
GNUTLS_LIBS=$(shell libgnutls-config --libs)
32
32
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
33
33
LDFLAGS=$(COVERAGE)
34
34
 
35
 
DOCBOOKTOMAN=xsltproc --nonet \
 
35
# Commands to format a DocBook refentry document into a manual page
 
36
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
36
37
        --param man.charmap.use.subset          0 \
37
38
        --param make.year.ranges                1 \
38
39
        --param make.single.year.ranges         1 \
39
40
        --param man.output.quietly              1 \
40
 
        --param man.authors.section.enabled     0
 
41
        --param man.authors.section.enabled     0 \
 
42
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
43
        $(notdir $<); \
 
44
        $(MANPOST) $(notdir $@)
41
45
# DocBook-to-man post-processing to fix a \n escape bug
42
 
MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
 
46
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
43
47
 
44
48
PLUGINS=plugins.d/password-prompt plugins.d/password-request
45
49
PROGS=plugin-runner $(PLUGINS)
54
58
 
55
59
doc: $(DOCS)
56
60
 
57
 
%.5: %.xml
58
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^) $(MANPOST) $@
59
 
 
60
 
%.8: %.xml
61
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $@
62
 
 
63
 
%.8mandos: %.xml
64
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^) $(MANPOST) $@
 
61
%.5: %.xml legalnotice.xml
 
62
        $(DOCBOOKTOMAN)
 
63
 
 
64
%.8: %.xml legalnotice.xml
 
65
        $(DOCBOOKTOMAN)
 
66
 
 
67
%.8mandos: %.xml legalnotice.xml
 
68
        $(DOCBOOKTOMAN)
 
69
 
 
70
mandos.8: mandos.xml mandos-options.xml
 
71
        $(DOCBOOKTOMAN)
 
72
 
 
73
mandos.conf.5: mandos.conf.xml mandos-options.xml
 
74
        $(DOCBOOKTOMAN)
65
75
 
66
76
plugins.d/password-request: plugins.d/password-request.o
67
77
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
77
87
distclean: clean
78
88
mostlyclean: clean
79
89
maintainer-clean: clean
80
 
        -rm --force --recursive keydir
 
90
        -rm --force --recursive keydir confdir
81
91
 
82
92
check:
83
93
        ./mandos --check
84
94
 
85
 
run-client: all
86
 
        -mkdir keydir
87
 
        -./mandos-keygen --dir keydir
 
95
# Run the client with a local config and key
 
96
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
97
        keydir/secring.gpg keydir/pubring.gpg
88
98
        ./plugin-runner --plugin-dir=plugins.d \
 
99
                --config-file=plugin-runner.conf \
89
100
                --options-for=password-request:--keydir=keydir
90
101
 
91
 
run-server:
92
 
        ./mandos --debug --configdir=.
 
102
# Used by run-client
 
103
keydir/secring.gpg: keydir/seckey.txt
 
104
        gpg --homedir $(dir $<) --import $^
 
105
keydir/pubring.gpg: keydir/pubkey.txt
 
106
        gpg --homedir $(dir $<) --import $^
 
107
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
108
        install --directory keydir
 
109
        ./mandos-keygen --dir keydir --force
 
110
 
 
111
# Run the server with a local config
 
112
run-server: confdir/mandos.conf confdir/clients.conf
 
113
        ./mandos --debug --configdir=confdir
 
114
 
 
115
# Used by run-server
 
116
confdir/mandos.conf: mandos.conf
 
117
        install --directory confdir
 
118
        install $^ $@
 
119
confdir/clients.conf: clients.conf keydir/seckey.txt
 
120
        install --directory confdir
 
121
        install clients.conf $@
 
122
# Add a client password
 
123
        ./mandos-keygen --dir keydir --password >> $@
93
124
 
94
125
install: install-server install-client
95
126
 
96
127
install-server: doc
97
 
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
 
128
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
98
129
                $(MANDIR)/man8
99
130
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
100
131
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
108
139
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
109
140
 
110
141
install-client: all doc /usr/share/initramfs-tools/hooks/.
111
 
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
112
 
                $(MANDIR)/man8
113
 
        -mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
142
        install --directory --parents $(PREFIX)/lib/mandos \
 
143
                $(CONFDIR) $(MANDIR)/man8
 
144
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
114
145
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
115
146
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
116
147
                plugin-runner