/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-08-18 05:24:20 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080818052420-ab5eurrioz8n2qy6
* Makefile: Bug fix: fixed creation of man pages in "plugins.d".

* mandos-keygen Bug fix: make the --expire option modify
                KEYEXPIRE, not KEYCOMMENT.  Use the "--no-options"
                option to gpg when exporting keys from the temporary
                key ring files.

* mandos-keygen.xml (EXIT STATUS): Filled in.
  (ENVIRONMENT): New section, documenting use of TMPDIR.
  (FILES): Document use of key files and /tmp.
  (BUGS): Filled in.
  (EXAMPLE): Added two examples.
  (SECURITY): Added some text.

* plugins.d/password-prompt.xml (NOTES): Removed, since this is
                                         created automatically for
                                         footnotes.
  (ENVIRONMENT, FILES): Added empty sections.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

* plugins.d/password-request.xml: Reordered sections.
  (ENVIRONMENT): New empty section.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

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