/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: 2009-04-16 01:00:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090416010035-y7ta6ra2da4gf6mp
Minor code cleanup; one minor bug fix.

* initramfs-tools-hook: Bug fix: Use the primary group of the first
                        suitable user found, do not look for a
                        group separately.
* mandos: Unconditionally import "struct" and "fcntl".  Use unicode
          strings everywhere possible.
  (Client._datetime_to_milliseconds): New static method.
  (Client.timeout_milliseconds, Client.interval_milliseconds): Use
                                                               above
                                                               method.
  (ClientDBus.CheckedOK,
  ClientDBus.Enable, ClientDBus.StopChecker): Define normally.
  (if_nametoindex): Document non-acceptance of unicode strings.  All
                    callers adjusted.  Do not import "struct" or
                    "fcntl".  Log warning message if if_nametoindex
                    cannot be found using ctypes modules.
  (main): Bug fix: Do not look for user named "nogroup".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
 
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
 
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
 
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
 
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
 
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
8
 
        -Wconversion -Wlogical-op -Waggregate-return \
9
 
        -Wstrict-prototypes -Wold-style-definition \
10
 
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
 
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
 
        -Wvolatile-register-var -Woverlength-strings
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
13
9
#DEBUG=-ggdb3
14
 
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
 
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
18
 
# The sanitizing options are available in GCC 4.9 and above.
19
 
ifeq ($(shell test $(shell $(CC) -dumpversion) \> 4.9-; echo $$?),0)
20
 
SANITIZE:=-fsanitize=address -fsanitize=undefined -fsanitize=shift \
21
 
        -fsanitize=integer-divide-by-zero -fsanitize=unreachable \
22
 
        -fsanitize=vla-bound -fsanitize=null -fsanitize=return \
23
 
        -fsanitize=signed-integer-overflow
24
 
# GCC 5.3 has some more sanitizing options
25
 
ifeq ($(shell test $(shell $(CC) -dumpversion) \> 5.3-; echo $$?),0)
26
 
SANITIZE+=-fsanitize=bounds -fsanitize=alignment \
27
 
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
28
 
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
29
 
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
30
 
        -fsanitize=enum
31
 
endif
32
 
else
33
 
SANITIZE:=
34
 
endif
35
 
LINK_FORTIFY_LD=-z relro -z now
36
 
LINK_FORTIFY=
37
 
 
38
 
# If BROKEN_PIE is set, do not build with -pie
39
 
ifndef BROKEN_PIE
40
 
FORTIFY += -fPIE
41
 
LINK_FORTIFY += -pie
42
 
endif
 
10
# For info about _FORTIFY_SOURCE, see
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
43
15
#COVERAGE=--coverage
44
 
OPTIMIZE=-Os -fno-strict-aliasing
45
 
LANGUAGE=-std=gnu11
 
16
OPTIMIZE=-Os
 
17
LANGUAGE=-std=gnu99
46
18
htmldir=man
47
 
version=1.7.3
 
19
version=1.0.8
48
20
SED=sed
49
21
 
50
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
51
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
52
 
 
53
22
## Use these settings for a traditional /usr/local install
54
23
# PREFIX=$(DESTDIR)/usr/local
55
24
# CONFDIR=$(DESTDIR)/etc/mandos
56
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
57
26
# MANDIR=$(PREFIX)/man
58
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
59
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
60
 
# LIBDIR=$(PREFIX)/lib
61
28
##
62
29
 
63
30
## These settings are for a package-type install
66
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
67
34
MANDIR=$(PREFIX)/share/man
68
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
69
 
STATEDIR=$(DESTDIR)/var/lib/mandos
70
 
LIBDIR=$(shell \
71
 
        for d in \
72
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
73
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
74
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
75
 
                        echo "$(DESTDIR)$$d"; \
76
 
                        break; \
77
 
                fi; \
78
 
        done)
79
36
##
80
37
 
81
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
82
 
 
83
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
84
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
85
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
86
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
87
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
88
43
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
89
44
        getconf LFS_LDFLAGS)
90
 
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
91
 
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
92
45
 
93
46
# Do not change these two
94
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
95
 
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
96
 
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
97
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
49
        -DVERSION='"$(version)"'
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
98
51
 
99
52
# Commands to format a DocBook <refentry> document into a manual page
100
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
101
54
        --param man.charmap.use.subset          0 \
102
55
        --param make.year.ranges                1 \
103
56
        --param make.single.year.ranges         1 \
104
57
        --param man.output.quietly              1 \
105
58
        --param man.authors.section.enabled     0 \
106
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
107
60
        $(notdir $<); \
108
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
109
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
110
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
111
 
        fi >/dev/null)
 
61
        $(MANPOST) $(notdir $@)
 
62
# DocBook-to-man post-processing to fix a '\n' escape bug
 
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
112
64
 
113
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
114
66
        --param make.year.ranges                1 \
115
67
        --param make.single.year.ranges         1 \
116
68
        --param man.output.quietly              1 \
118
70
        --param citerefentry.link               1 \
119
71
        --output $@ \
120
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
121
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
122
74
# Fix citerefentry links
123
75
HTMLPOST=$(SED) --in-place \
124
76
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
125
77
 
126
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
127
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
128
 
        plugins.d/plymouth
129
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
130
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
131
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
132
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
133
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
80
CPROGS=plugin-runner $(PLUGINS)
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
134
83
        plugins.d/mandos-client.8mandos \
135
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
136
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
137
 
        plugins.d/plymouth.8mandos intro.8mandos
 
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
85
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
86
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
138
87
 
139
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
140
89
 
161
110
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
162
111
        $(DOCBOOKTOHTML)
163
112
 
164
 
intro.8mandos: intro.xml common.ent legalnotice.xml
165
 
        $(DOCBOOKTOMAN)
166
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
167
 
        $(DOCBOOKTOHTML)
168
 
 
169
113
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
170
114
                legalnotice.xml
171
115
        $(DOCBOOKTOMAN)
180
124
                 legalnotice.xml
181
125
        $(DOCBOOKTOHTML)
182
126
 
183
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
184
 
                legalnotice.xml
185
 
        $(DOCBOOKTOMAN)
186
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
187
 
                 legalnotice.xml
188
 
        $(DOCBOOKTOHTML)
189
 
 
190
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
191
 
                legalnotice.xml
192
 
        $(DOCBOOKTOMAN)
193
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
194
 
                 legalnotice.xml
195
 
        $(DOCBOOKTOHTML)
196
 
 
197
127
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
198
128
                legalnotice.xml
199
129
        $(DOCBOOKTOMAN)
221
151
 
222
152
# Update all these files with version number $(version)
223
153
common.ent: Makefile
224
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
225
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
226
 
                $@)
 
156
                $@
227
157
 
228
158
mandos: Makefile
229
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
230
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
231
 
                $@)
 
161
                $@
232
162
 
233
163
mandos-keygen: Makefile
234
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
235
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
236
 
                $@)
 
166
                $@
237
167
 
238
168
mandos-ctl: Makefile
239
 
        $(strip $(SED) --in-place \
240
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
241
 
                $@)
242
 
 
243
 
mandos-monitor: Makefile
244
 
        $(strip $(SED) --in-place \
245
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
246
 
                $@)
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
247
172
 
248
173
mandos.lsm: Makefile
249
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
250
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
251
 
                $@)
252
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
253
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
254
 
                $@)
255
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
256
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
257
 
                $@)
258
 
 
259
 
plugins.d/mandos-client: plugins.d/mandos-client.c
260
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
261
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
262
 
 
263
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
264
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
265
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
266
 
 
267
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
268
 
        check run-client run-server install install-html \
269
 
        install-server install-client-nokey install-client uninstall \
270
 
        uninstall-server uninstall-client purge purge-server \
271
 
        purge-client
 
182
                $@
 
183
 
 
184
plugins.d/mandos-client: plugins.d/mandos-client.o
 
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
186
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
187
 
 
188
.PHONY : all doc html clean distclean run-client run-server install \
 
189
        install-server install-client uninstall uninstall-server \
 
190
        uninstall-client purge purge-server purge-client
272
191
 
273
192
clean:
274
193
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
276
195
distclean: clean
277
196
mostlyclean: clean
278
197
maintainer-clean: clean
279
 
        -rm --force --recursive keydir confdir statedir
 
198
        -rm --force --recursive keydir confdir
280
199
 
281
200
check:  all
282
201
        ./mandos --check
283
 
        ./mandos-ctl --check
284
202
 
285
203
# Run the client with a local config and key
286
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
287
 
        @echo "###################################################################"
288
 
        @echo "# The following error messages are harmless and can be safely     #"
289
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
290
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
291
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
292
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
293
 
        @echo "#                     setuid: Operation not permitted             #"
294
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
295
 
        @echo "# From mandos-client:                                             #"
296
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
297
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
298
 
        @echo "###################################################################"
299
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
300
205
        ./plugin-runner --plugin-dir=plugins.d \
301
 
                --plugin-helper-dir=plugin-helpers \
302
206
                --config-file=plugin-runner.conf \
303
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
304
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
305
208
                $(CLIENTARGS)
306
209
 
307
210
# Used by run-client
310
213
        ./mandos-keygen --dir keydir --force
311
214
 
312
215
# Run the server with a local config
313
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
314
 
        ./mandos --debug --no-dbus --configdir=confdir \
315
 
                --statedir=statedir $(SERVERARGS)
 
216
run-server: confdir/mandos.conf confdir/clients.conf
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
316
218
 
317
219
# Used by run-server
318
220
confdir/mandos.conf: mandos.conf
322
224
        install --directory confdir
323
225
        install --mode=u=rw $< $@
324
226
# Add a client password
325
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
326
 
statedir:
327
 
        install --directory statedir
 
227
        ./mandos-keygen --dir keydir --password >> $@
328
228
 
329
229
install: install-server install-client-nokey
330
230
 
335
235
 
336
236
install-server: doc
337
237
        install --directory $(CONFDIR)
338
 
        if install --directory --mode=u=rwx --owner=$(USER) \
339
 
                --group=$(GROUP) $(STATEDIR); then \
340
 
                :; \
341
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
342
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
343
 
        fi
344
238
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
345
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
346
 
                mandos-ctl
347
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
348
 
                mandos-monitor
349
239
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
350
240
                mandos.conf
351
241
        install --mode=u=rw --target-directory=$(CONFDIR) \
352
242
                clients.conf
353
 
        install --mode=u=rw,go=r dbus-mandos.conf \
354
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
355
243
        install --mode=u=rwx,go=rx init.d-mandos \
356
244
                $(DESTDIR)/etc/init.d/mandos
357
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
358
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
359
 
        fi
360
245
        install --mode=u=rw,go=r default-mandos \
361
246
                $(DESTDIR)/etc/default/mandos
362
247
        if [ -z $(DESTDIR) ]; then \
364
249
        fi
365
250
        gzip --best --to-stdout mandos.8 \
366
251
                > $(MANDIR)/man8/mandos.8.gz
367
 
        gzip --best --to-stdout mandos-monitor.8 \
368
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
369
 
        gzip --best --to-stdout mandos-ctl.8 \
370
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
371
252
        gzip --best --to-stdout mandos.conf.5 \
372
253
                > $(MANDIR)/man5/mandos.conf.5.gz
373
254
        gzip --best --to-stdout mandos-clients.conf.5 \
374
255
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
375
 
        gzip --best --to-stdout intro.8mandos \
376
 
                > $(MANDIR)/man8/intro.8mandos.gz
377
256
 
378
257
install-client-nokey: all doc
379
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
258
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
380
259
        install --directory --mode=u=rwx $(KEYDIR) \
381
 
                $(LIBDIR)/mandos/plugins.d \
382
 
                $(LIBDIR)/mandos/plugin-helpers
383
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
260
                $(PREFIX)/lib/mandos/plugins.d
 
261
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
384
262
                install --mode=u=rwx \
385
263
                        --directory "$(CONFDIR)/plugins.d"; \
386
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
387
264
        fi
388
 
        install --mode=u=rwx,go=rx --directory \
389
 
                "$(CONFDIR)/network-hooks.d"
390
265
        install --mode=u=rwx,go=rx \
391
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
266
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
392
267
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
393
268
                mandos-keygen
394
269
        install --mode=u=rwx,go=rx \
395
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
270
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
396
271
                plugins.d/password-prompt
397
272
        install --mode=u=rwxs,go=rx \
398
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
273
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
399
274
                plugins.d/mandos-client
400
275
        install --mode=u=rwxs,go=rx \
401
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
276
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
402
277
                plugins.d/usplash
403
278
        install --mode=u=rwxs,go=rx \
404
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
279
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
405
280
                plugins.d/splashy
406
281
        install --mode=u=rwxs,go=rx \
407
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
408
283
                plugins.d/askpass-fifo
409
 
        install --mode=u=rwxs,go=rx \
410
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
411
 
                plugins.d/plymouth
412
 
        install --mode=u=rwxs,go=rx \
413
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
414
 
                plugin-helpers/mandos-client-iprouteadddel
415
284
        install initramfs-tools-hook \
416
285
                $(INITRAMFSTOOLS)/hooks/mandos
417
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
423
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
424
293
        gzip --best --to-stdout plugin-runner.8mandos \
425
294
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
295
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
426
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
427
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
428
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
429
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
430
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
431
300
                > $(MANDIR)/man8/usplash.8mandos.gz
432
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
433
302
                > $(MANDIR)/man8/splashy.8mandos.gz
434
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
435
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
436
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
437
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
438
305
 
439
306
install-client: install-client-nokey
440
307
# Post-installation stuff
446
313
 
447
314
uninstall-server:
448
315
        -rm --force $(PREFIX)/sbin/mandos \
449
 
                $(PREFIX)/sbin/mandos-ctl \
450
 
                $(PREFIX)/sbin/mandos-monitor \
451
316
                $(MANDIR)/man8/mandos.8.gz \
452
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
453
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
454
317
                $(MANDIR)/man5/mandos.conf.5.gz \
455
318
                $(MANDIR)/man5/mandos-clients.conf.5.gz
456
319
        update-rc.d -f mandos remove
462
325
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
463
326
                $(DESTDIR)/etc/crypttab
464
327
        -rm --force $(PREFIX)/sbin/mandos-keygen \
465
 
                $(LIBDIR)/mandos/plugin-runner \
466
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
467
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
468
 
                $(LIBDIR)/mandos/plugins.d/usplash \
469
 
                $(LIBDIR)/mandos/plugins.d/splashy \
470
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
471
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
328
                $(PREFIX)/lib/mandos/plugin-runner \
 
329
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
330
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
472
334
                $(INITRAMFSTOOLS)/hooks/mandos \
473
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
474
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
475
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
476
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
477
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
478
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
479
340
                $(MANDIR)/man8/usplash.8mandos.gz \
480
341
                $(MANDIR)/man8/splashy.8mandos.gz \
481
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
482
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
483
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
484
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
485
346
        update-initramfs -k all -u
486
347
 
487
348
purge: purge-server purge-client
488
349
 
489
350
purge-server: uninstall-server
490
351
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
491
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
492
352
                $(DESTDIR)/etc/default/mandos \
493
353
                $(DESTDIR)/etc/init.d/mandos \
494
 
                $(SYSTEMD)/mandos.service \
495
 
                $(DESTDIR)/run/mandos.pid \
496
354
                $(DESTDIR)/var/run/mandos.pid
497
355
        -rmdir $(CONFDIR)
498
356