/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 at bsnet
  • Date: 2011-11-12 18:14:55 UTC
  • mto: (237.7.70 trunk)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@fukt.bsnet.se-20111112181455-8m6z4qrrib33bl2c
* plugins.d/mandos-client.c (SYNOPSIS, OPTIONS): Document
                                                 "--network-hook-dir"
                                                 option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.5.5
 
26
version=1.4.1
27
27
SED=sed
28
28
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
29
## Use these settings for a traditional /usr/local install
33
30
# PREFIX=$(DESTDIR)/usr/local
34
31
# CONFDIR=$(DESTDIR)/etc/mandos
35
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
33
# MANDIR=$(PREFIX)/man
37
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
35
##
40
36
 
41
37
## These settings are for a package-type install
44
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
41
MANDIR=$(PREFIX)/share/man
46
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
43
##
49
44
 
50
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
68
63
        --param make.single.year.ranges         1 \
69
64
        --param man.output.quietly              1 \
70
65
        --param man.authors.section.enabled     0 \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
67
        $(notdir $<); \
73
68
        $(MANPOST) $(notdir $@);\
74
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
 
        fi >/dev/null)
 
69
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
70
        --local-file $(notdir $@) >/dev/null)
78
71
# DocBook-to-man post-processing to fix a '\n' escape bug
79
72
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
73
 
237
230
distclean: clean
238
231
mostlyclean: clean
239
232
maintainer-clean: clean
240
 
        -rm --force --recursive keydir confdir statedir
 
233
        -rm --force --recursive keydir confdir
241
234
 
242
235
check:  all
243
236
        ./mandos --check
257
250
        @echo "###################################################################"
258
251
        ./plugin-runner --plugin-dir=plugins.d \
259
252
                --config-file=plugin-runner.conf \
260
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
253
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
261
254
                $(CLIENTARGS)
262
255
 
263
256
# Used by run-client
266
259
        ./mandos-keygen --dir keydir --force
267
260
 
268
261
# Run the server with a local config
269
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
270
 
        ./mandos --debug --no-dbus --configdir=confdir \
271
 
                --statedir=statedir $(SERVERARGS)
 
262
run-server: confdir/mandos.conf confdir/clients.conf
 
263
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
272
264
 
273
265
# Used by run-server
274
266
confdir/mandos.conf: mandos.conf
279
271
        install --mode=u=rw $< $@
280
272
# Add a client password
281
273
        ./mandos-keygen --dir keydir --password >> $@
282
 
statedir:
283
 
        install --directory statedir
284
274
 
285
275
install: install-server install-client-nokey
286
276
 
291
281
 
292
282
install-server: doc
293
283
        install --directory $(CONFDIR)
294
 
        install --directory --mode=u=rwx --owner=$(USER) \
295
 
                --group=$(GROUP) $(STATEDIR)
296
284
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
297
285
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
298
286
                mandos-ctl
321
309
                > $(MANDIR)/man5/mandos.conf.5.gz
322
310
        gzip --best --to-stdout mandos-clients.conf.5 \
323
311
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
324
 
        gzip --best --to-stdout intro.8mandos \
325
 
                > $(MANDIR)/man8/intro.8mandos.gz
326
312
 
327
313
install-client-nokey: all doc
328
314
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
332
318
                install --mode=u=rwx \
333
319
                        --directory "$(CONFDIR)/plugins.d"; \
334
320
        fi
335
 
        install --mode=u=rwx,go=rx --directory \
336
 
                "$(CONFDIR)/network-hooks.d"
337
321
        install --mode=u=rwx,go=rx \
338
322
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
339
323
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \