/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-01-01 04:02:00 UTC
  • Revision ID: teddy@recompile.se-20120101040200-8wgma707v4gi7hxn
* debian/rules (binary-common): Exclude network-hooks.d from
                                dh_fixperms.
* mandos (DBusObjectWithProperties.Set): Bug fix: handle byte arrays.
* mandos-clients.conf.xml (DESCRIPTION): Add reference to persistent
                                         state.
* mandos-options.xml (restore): Adjust wording slightly.
* mandos.xml (OPTIONS/--no-restore): Refer to "PERSISTENT STATE"
                                     section.
  (PERSISTENT STATE): New section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.5.4
 
26
version=1.4.1
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
 
        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)
 
74
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
75
        --local-file $(notdir $@) >/dev/null)
78
76
# DocBook-to-man post-processing to fix a '\n' escape bug
79
77
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
78
 
266
264
        ./mandos-keygen --dir keydir --force
267
265
 
268
266
# Run the server with a local config
269
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
267
run-server: confdir/mandos.conf confdir/clients.conf
270
268
        ./mandos --debug --no-dbus --configdir=confdir \
271
269
                --statedir=statedir $(SERVERARGS)
272
270
 
321
319
                > $(MANDIR)/man5/mandos.conf.5.gz
322
320
        gzip --best --to-stdout mandos-clients.conf.5 \
323
321
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
324
 
        gzip --best --to-stdout intro.8mandos \
325
 
                > $(MANDIR)/man8/intro.8mandos.gz
326
322
 
327
323
install-client-nokey: all doc
328
324
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)