/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)
59
56
doc: $(DOCS)
60
57
 
61
58
%.5: %.xml
62
 
        $(DOCBOOKTOMAN)
 
59
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^) $(MANPOST) $(notdir $@)
63
60
 
64
61
%.8: %.xml
65
 
        $(DOCBOOKTOMAN)
 
62
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
66
63
 
67
64
%.8mandos: %.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
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
75
66
 
76
67
plugins.d/password-request: plugins.d/password-request.o
77
68
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
104
95
install: install-server install-client
105
96
 
106
97
install-server: doc
107
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
98
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
108
99
                $(MANDIR)/man8
109
100
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
110
101
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
118
109
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
119
110
 
120
111
install-client: all doc /usr/share/initramfs-tools/hooks/.
121
 
        install --directory --parents $(PREFIX)/lib/mandos \
122
 
                $(CONFDIR) $(MANDIR)/man8
123
 
        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
124
115
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
125
116
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
126
117
                plugin-runner