/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

Miscellaneous fixes prompted by lintian:

* debian/control (Conflicts): Changed to "Breaks:".
* debian/copyright: Updated format.
* debian/mandos-client.postinst: Use "set -e" instead of "#!/bin/sh -e".
* debian/mandos-client.postrm: - '' -
* debian/mandos.postinst: - '' -
* debian/mandos.prerm: Consistent magic.
* mandos: Small comment change.
* mandos-clients.conf.xml (OPTIONS/extended_timeout): Fix spelling.

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.4.1
 
26
version=1.4.0
27
27
SED=sed
28
28
 
29
29
## Use these settings for a traditional /usr/local install
65
65
        --param man.authors.section.enabled     0 \
66
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
67
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
71
69
# DocBook-to-man post-processing to fix a '\n' escape bug
72
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
73
71
 
250
248
        @echo "###################################################################"
251
249
        ./plugin-runner --plugin-dir=plugins.d \
252
250
                --config-file=plugin-runner.conf \
253
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
251
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
254
252
                $(CLIENTARGS)
255
253
 
256
254
# Used by run-client
324
322
                install --mode=u=rwx \
325
323
                        --directory "$(CONFDIR)/plugins.d"; \
326
324
        fi
327
 
        install --mode=u=rwx,go=rx --directory \
328
 
                "$(CONFDIR)/network-hooks.d"
329
325
        install --mode=u=rwx,go=rx \
330
326
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
331
327
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \