/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: 2008-08-19 23:44:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080819234417-8dz5prw19ihrklx6
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
                           commands here, and use it everywhere.
  (mandos.8, mandos.conf.5): New; also depend on "mandos-options.xml".

* mandos-keygen.xml: Removed OVERVIEW entity.  Add XInclude namespace.
  (OVERVIEW): Changed to do <xi:include/>.

* mandos-options.xml (<simplesect>): Changed to a <section>.
  ([@id="address"]): Reordered sentences.

* mandos.conf.xml (OPTIONS): Removed illegal <arg> tags.
  (EXAMPLE): Added empty example.

* mandos.xml (NETWORK PROTOCOL): Bug fix: Changed "1\r\en" back to
                                 "1\r\n".
  (CHECKING): Do not refer to the non-relevant mandos.conf(5) manual.

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)
33
33
LDFLAGS=$(COVERAGE)
34
34
 
35
35
# Commands to format a DocBook refentry document into a manual page
36
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
36
DOCBOOKTOMAN=cd $(dir $^); xsltproc --nonet --xinclude \
37
37
        --param man.charmap.use.subset          0 \
38
38
        --param make.year.ranges                1 \
39
39
        --param make.single.year.ranges         1 \
43
43
        $(notdir $<); \
44
44
        $(MANPOST) $(notdir $@)
45
45
# 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'
 
46
MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
47
47
 
48
48
PLUGINS=plugins.d/password-prompt plugins.d/password-request
49
49
PROGS=plugin-runner $(PLUGINS)
87
87
distclean: clean
88
88
mostlyclean: clean
89
89
maintainer-clean: clean
90
 
        -rm --force --recursive keydir confdir
 
90
        -rm --force --recursive keydir
91
91
 
92
92
check:
93
93
        ./mandos --check
94
94
 
95
 
# Run the server with a local key
96
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
97
 
        keydir/secring.gpg keydir/pubring.gpg
 
95
run-client: all
 
96
        -mkdir keydir
 
97
        -./mandos-keygen --dir keydir
98
98
        ./plugin-runner --plugin-dir=plugins.d \
99
99
                --options-for=password-request:--keydir=keydir
100
100
 
101
 
# Used by run-client
102
 
keydir/secring.gpg: keydir/seckey.txt
103
 
        gpg --homedir $(dir $<) --import $^
104
 
keydir/pubring.gpg: keydir/pubkey.txt
105
 
        gpg --homedir $(dir $<) --import $^
106
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
107
 
        install --directory keydir
108
 
        ./mandos-keygen --dir keydir --force
109
 
 
110
 
# Run the server with a local config
111
 
run-server: confdir/mandos.conf confdir/clients.conf
112
 
        ./mandos --debug --configdir=confdir
113
 
 
114
 
# Used by run-server
115
 
confdir/mandos.conf: mandos.conf
116
 
        install --directory confdir
117
 
        install $^ $@
118
 
confdir/clients.conf: clients.conf keydir/seckey.txt
119
 
        install --directory confdir
120
 
        install clients.conf $@
121
 
# Add a client password
122
 
        ./mandos-keygen --dir keydir --password >> $@
 
101
run-server:
 
102
        ./mandos --debug --configdir=.
123
103
 
124
104
install: install-server install-client
125
105
 
126
106
install-server: doc
127
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
107
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
128
108
                $(MANDIR)/man8
129
109
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
130
110
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
138
118
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
139
119
 
140
120
install-client: all doc /usr/share/initramfs-tools/hooks/.
141
 
        install --directory --parents $(PREFIX)/lib/mandos \
142
 
                $(CONFDIR) $(MANDIR)/man8
143
 
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
121
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
 
122
                $(MANDIR)/man8
 
123
        -mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d
144
124
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
145
125
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
146
126
                plugin-runner