/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

* network-hooks.d/openvpn: Tolerate relative MANDOSNETHOOKDIR path.
  (stop): Bug fix: Fix quote escapes.
* network-hooks.d/openvpn.conf: Remove compression.

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