/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: 2012-06-01 21:48:12 UTC
  • Revision ID: teddy@recompile.se-20120601214812-g7685v5oeiuhi2qw
* debian/copyright (Copyright): Join the two lines to one line.
* debian/mandos-client.README.Debian: Refer to new location of example
  network hooks.
* debian/mandos-client.docs (network-hooks.d): Removed.
* debian/mandos-client.examples: New; contains "network-hooks.d".
* debian/rules (binary-common): Added "dh_installexamples".
  (binary-common/dh_fixperms): Changed to exclude new location of
  "network-hooks.d".
* init.d-mandos (status): Support new "status" action.

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.4.1
 
26
version=1.5.5
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
71
71
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
72
        $(notdir $<); \
73
73
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
74
        if locale --all | grep --regexp='^en_US\.utf8$$' && type man \
 
75
        2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 man \
 
76
        --warnings --encoding=UTF-8 --local-file $(notdir $@); fi \
 
77
        >/dev/null)
76
78
# DocBook-to-man post-processing to fix a '\n' escape bug
77
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
80
 
255
257
        @echo "###################################################################"
256
258
        ./plugin-runner --plugin-dir=plugins.d \
257
259
                --config-file=plugin-runner.conf \
258
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
260
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
259
261
                $(CLIENTARGS)
260
262
 
261
263
# Used by run-client
264
266
        ./mandos-keygen --dir keydir --force
265
267
 
266
268
# Run the server with a local config
267
 
run-server: confdir/mandos.conf confdir/clients.conf
 
269
run-server: confdir/mandos.conf confdir/clients.conf statedir
268
270
        ./mandos --debug --no-dbus --configdir=confdir \
269
271
                --statedir=statedir $(SERVERARGS)
270
272
 
319
321
                > $(MANDIR)/man5/mandos.conf.5.gz
320
322
        gzip --best --to-stdout mandos-clients.conf.5 \
321
323
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
324
        gzip --best --to-stdout intro.8mandos \
 
325
                > $(MANDIR)/man8/intro.8mandos.gz
322
326
 
323
327
install-client-nokey: all doc
324
328
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
328
332
                install --mode=u=rwx \
329
333
                        --directory "$(CONFDIR)/plugins.d"; \
330
334
        fi
 
335
        install --mode=u=rwx,go=rx --directory \
 
336
                "$(CONFDIR)/network-hooks.d"
331
337
        install --mode=u=rwx,go=rx \
332
338
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
333
339
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \