/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: 2008-09-06 00:19:53 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080906001953-5nk5uti6shzuyqdr
* plugins.d/password-prompt.c (main): If successful, output an extra
                                      newline to the console before
                                      exiting, to change to a new line
                                      away from the prompt.

* plugins.d/password-request.c (main): Bug fix: Moved calls to
                                       "init_gnutls_global()",
                                       "mkdtemp()", and "init_gpgme()"
                                       to *after* changing user &
                                       group.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
9
 
#DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
 
8
        -Wvolatile-register-var
 
9
DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY += -pie
21
 
endif
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
22
13
#COVERAGE=--coverage
23
14
OPTIMIZE=-Os
24
15
LANGUAGE=-std=gnu99
25
 
htmldir=man
26
 
version=1.0.14
27
 
SED=sed
28
 
 
29
 
## Use these settings for a traditional /usr/local install
30
 
# PREFIX=$(DESTDIR)/usr/local
31
 
# CONFDIR=$(DESTDIR)/etc/mandos
32
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
 
# MANDIR=$(PREFIX)/man
34
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
35
 
##
36
 
 
37
 
## These settings are for a package-type install
 
16
# PREFIX=/usr/local
38
17
PREFIX=$(DESTDIR)/usr
 
18
# CONFDIR=/usr/local/lib/mandos
39
19
CONFDIR=$(DESTDIR)/etc/mandos
 
20
# KEYDIR=/usr/local/lib/mandos/keys
40
21
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
 
MANDIR=$(PREFIX)/share/man
42
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
 
##
 
22
# MANDIR=/usr/local/man
 
23
MANDIR=$(DESTDIR)/usr/share/man
44
24
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
25
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
26
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
27
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
28
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
 
        getconf LFS_LDFLAGS)
 
29
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
30
GPGME_LIBS=$(shell gpgme-config --libs)
52
31
 
53
32
# Do not change these two
54
33
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
 
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
34
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
35
LDFLAGS=$(COVERAGE)
58
36
 
59
 
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
37
# Commands to format a DocBook refentry document into a manual page
 
38
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
39
        --param man.charmap.use.subset          0 \
62
40
        --param make.year.ranges                1 \
63
41
        --param make.single.year.ranges         1 \
65
43
        --param man.authors.section.enabled     0 \
66
44
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
45
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
69
 
# DocBook-to-man post-processing to fix a '\n' escape bug
70
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
 
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
73
 
        --param make.year.ranges                1 \
74
 
        --param make.single.year.ranges         1 \
75
 
        --param man.output.quietly              1 \
76
 
        --param man.authors.section.enabled     0 \
77
 
        --param citerefentry.link               1 \
78
 
        --output $@ \
79
 
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
81
 
# Fix citerefentry links
82
 
HTMLPOST=$(SED) --in-place \
83
 
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
84
 
 
85
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
88
 
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
46
        $(MANPOST) $(notdir $@)
 
47
# DocBook-to-man post-processing to fix a \n escape bug
 
48
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
49
 
 
50
PLUGINS=plugins.d/password-prompt plugins.d/password-request
 
51
PROGS=plugin-runner $(PLUGINS)
90
52
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
 
        mandos-monitor.8 \
92
 
        plugins.d/mandos-client.8mandos \
 
53
        plugins.d/password-request.8mandos \
93
54
        plugins.d/password-prompt.8mandos mandos.conf.5 \
94
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
95
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
96
 
 
97
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
 
 
99
 
objects=$(addsuffix .o,$(CPROGS))
100
 
 
101
 
all: $(PROGS) mandos.lsm
 
55
        mandos-clients.conf.5
 
56
 
 
57
objects=$(addsuffix .o,$(PROGS))
 
58
 
 
59
all: $(PROGS)
102
60
 
103
61
doc: $(DOCS)
104
62
 
105
 
html: $(htmldocs)
106
 
 
107
 
%.5: %.xml common.ent legalnotice.xml
108
 
        $(DOCBOOKTOMAN)
109
 
%.5.xhtml: %.xml common.ent legalnotice.xml
110
 
        $(DOCBOOKTOHTML)
111
 
 
112
 
%.8: %.xml common.ent legalnotice.xml
113
 
        $(DOCBOOKTOMAN)
114
 
%.8.xhtml: %.xml common.ent legalnotice.xml
115
 
        $(DOCBOOKTOHTML)
116
 
 
117
 
%.8mandos: %.xml common.ent legalnotice.xml
118
 
        $(DOCBOOKTOMAN)
119
 
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
 
        $(DOCBOOKTOHTML)
121
 
 
122
 
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
 
                legalnotice.xml
124
 
        $(DOCBOOKTOMAN)
125
 
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
126
 
                overview.xml legalnotice.xml
127
 
        $(DOCBOOKTOHTML)
128
 
 
129
 
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
130
 
                legalnotice.xml
131
 
        $(DOCBOOKTOMAN)
132
 
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
133
 
                 legalnotice.xml
134
 
        $(DOCBOOKTOHTML)
135
 
 
136
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
137
 
                legalnotice.xml
138
 
        $(DOCBOOKTOMAN)
139
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
140
 
                 legalnotice.xml
141
 
        $(DOCBOOKTOHTML)
142
 
 
143
 
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
144
 
                legalnotice.xml
145
 
        $(DOCBOOKTOMAN)
146
 
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
147
 
                legalnotice.xml
148
 
        $(DOCBOOKTOHTML)
149
 
 
150
 
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
151
 
                legalnotice.xml
152
 
        $(DOCBOOKTOMAN)
153
 
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
154
 
                overview.xml legalnotice.xml
155
 
        $(DOCBOOKTOHTML)
156
 
 
157
 
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
158
 
                                        common.ent \
159
 
                                        mandos-options.xml \
160
 
                                        overview.xml legalnotice.xml
161
 
        $(DOCBOOKTOMAN)
162
 
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
163
 
                                        common.ent \
164
 
                                        mandos-options.xml \
165
 
                                        overview.xml legalnotice.xml
166
 
        $(DOCBOOKTOHTML)
167
 
 
168
 
# Update all these files with version number $(version)
169
 
common.ent: Makefile
170
 
        $(strip $(SED) --in-place \
171
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
172
 
                $@)
173
 
 
174
 
mandos: Makefile
175
 
        $(strip $(SED) --in-place \
176
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
177
 
                $@)
178
 
 
179
 
mandos-keygen: Makefile
180
 
        $(strip $(SED) --in-place \
181
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
182
 
                $@)
183
 
 
184
 
mandos-ctl: Makefile
185
 
        $(strip $(SED) --in-place \
186
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
187
 
                $@)
188
 
 
189
 
mandos-monitor: Makefile
190
 
        $(strip $(SED) --in-place \
191
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
192
 
                $@)
193
 
 
194
 
mandos.lsm: Makefile
195
 
        $(strip $(SED) --in-place \
196
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
197
 
                $@)
198
 
        $(strip $(SED) --in-place \
199
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
200
 
                $@)
201
 
        $(strip $(SED) --in-place \
202
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
203
 
                $@)
204
 
 
205
 
plugins.d/mandos-client: plugins.d/mandos-client.c
206
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
207
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
208
 
 
209
 
.PHONY : all doc html clean distclean run-client run-server install \
 
63
%.5: %.xml legalnotice.xml
 
64
        $(DOCBOOKTOMAN)
 
65
 
 
66
%.8: %.xml legalnotice.xml
 
67
        $(DOCBOOKTOMAN)
 
68
 
 
69
%.8mandos: %.xml legalnotice.xml
 
70
        $(DOCBOOKTOMAN)
 
71
 
 
72
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
 
73
        $(DOCBOOKTOMAN)
 
74
 
 
75
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
 
76
        $(DOCBOOKTOMAN)
 
77
 
 
78
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
 
79
        $(DOCBOOKTOMAN)
 
80
 
 
81
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
 
82
        $(DOCBOOKTOMAN)
 
83
 
 
84
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
 
85
                                        mandos-options.xml \
 
86
                                        overview.xml legalnotice.xml
 
87
        $(DOCBOOKTOMAN)
 
88
 
 
89
plugins.d/password-request: plugins.d/password-request.o
 
90
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
91
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
92
 
 
93
.PHONY : all doc clean distclean run-client run-server install \
210
94
        install-server install-client uninstall uninstall-server \
211
95
        uninstall-client purge purge-server purge-client
212
96
 
213
97
clean:
214
 
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
 
98
        -rm --force $(PROGS) $(objects) $(DOCS) core
215
99
 
216
100
distclean: clean
217
101
mostlyclean: clean
218
102
maintainer-clean: clean
219
103
        -rm --force --recursive keydir confdir
220
104
 
221
 
check:  all
 
105
check:
222
106
        ./mandos --check
223
107
 
224
108
# Run the client with a local config and key
225
109
run-client: all keydir/seckey.txt keydir/pubkey.txt
226
 
        @echo "###################################################################"
227
 
        @echo "# The following error messages are harmless and can be safely     #"
228
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
229
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
230
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
231
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
232
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
233
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
234
 
        @echo "#                     seteuid: Operation not permitted            #"
235
 
        @echo "#                     klogctl: Operation not permitted            #"
236
 
        @echo "###################################################################"
237
110
        ./plugin-runner --plugin-dir=plugins.d \
238
111
                --config-file=plugin-runner.conf \
239
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
240
 
                $(CLIENTARGS)
 
112
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
241
113
 
242
114
# Used by run-client
243
115
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
246
118
 
247
119
# Run the server with a local config
248
120
run-server: confdir/mandos.conf confdir/clients.conf
249
 
        @echo "#################################################################"
250
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
251
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
252
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
253
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
254
 
        @echo "#################################################################"
255
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
121
        ./mandos --debug --configdir=confdir
256
122
 
257
123
# Used by run-server
258
124
confdir/mandos.conf: mandos.conf
264
130
# Add a client password
265
131
        ./mandos-keygen --dir keydir --password >> $@
266
132
 
267
 
install: install-server install-client-nokey
268
 
 
269
 
install-html: html
270
 
        install --directory $(htmldir)
271
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
272
 
                $(htmldocs)
 
133
install: install-server install-client
273
134
 
274
135
install-server: doc
275
 
        install --directory $(CONFDIR)
 
136
        install --directory $(CONFDIR) $(MANDIR)/man5 \
 
137
                $(MANDIR)/man8
276
138
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
277
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
278
 
                mandos-ctl
279
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
280
 
                mandos-monitor
281
139
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
282
140
                mandos.conf
283
141
        install --mode=u=rw --target-directory=$(CONFDIR) \
284
142
                clients.conf
285
 
        install --mode=u=rw,go=r dbus-mandos.conf \
286
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
287
 
        install --mode=u=rwx,go=rx init.d-mandos \
288
 
                $(DESTDIR)/etc/init.d/mandos
289
 
        install --mode=u=rw,go=r default-mandos \
290
 
                $(DESTDIR)/etc/default/mandos
291
 
        if [ -z $(DESTDIR) ]; then \
292
 
                update-rc.d mandos defaults 25 15;\
293
 
        fi
 
143
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
 
144
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
 
145
        update-rc.d mandos defaults
294
146
        gzip --best --to-stdout mandos.8 \
295
147
                > $(MANDIR)/man8/mandos.8.gz
296
148
        gzip --best --to-stdout mandos.conf.5 \
298
150
        gzip --best --to-stdout mandos-clients.conf.5 \
299
151
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
300
152
 
301
 
install-client-nokey: all doc
302
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
303
 
        install --directory --mode=u=rwx $(KEYDIR) \
 
153
install-client: all doc /usr/share/initramfs-tools/hooks/.
 
154
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
 
155
                $(MANDIR)/man8
 
156
        install --directory --mode=u=rwx $(KEYDIR)
 
157
        install --directory --mode=u=rwx \
304
158
                $(PREFIX)/lib/mandos/plugins.d
305
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
159
        if [ "$(CONFDIR)/plugins.d" \
 
160
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
306
161
                install --mode=u=rwx \
307
162
                        --directory "$(CONFDIR)/plugins.d"; \
308
163
        fi
315
170
                plugins.d/password-prompt
316
171
        install --mode=u=rwxs,go=rx \
317
172
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
318
 
                plugins.d/mandos-client
319
 
        install --mode=u=rwxs,go=rx \
 
173
                plugins.d/password-request
 
174
        install --mode=u=rwx,go=rx \
320
175
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
321
176
                plugins.d/usplash
322
 
        install --mode=u=rwxs,go=rx \
323
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
324
 
                plugins.d/splashy
325
 
        install --mode=u=rwxs,go=rx \
326
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
327
 
                plugins.d/askpass-fifo
328
 
        install --mode=u=rwxs,go=rx \
329
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
330
 
                plugins.d/plymouth
331
177
        install initramfs-tools-hook \
332
 
                $(INITRAMFSTOOLS)/hooks/mandos
333
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
334
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
178
                /usr/share/initramfs-tools/hooks/mandos
 
179
        install initramfs-tools-hook-conf \
 
180
                /usr/share/initramfs-tools/conf-hooks.d/mandos
335
181
        install initramfs-tools-script \
336
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
182
                /usr/share/initramfs-tools/scripts/local-top/mandos
337
183
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
338
184
        gzip --best --to-stdout mandos-keygen.8 \
339
185
                > $(MANDIR)/man8/mandos-keygen.8.gz
341
187
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
342
188
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
343
189
                > $(MANDIR)/man8/password-prompt.8mandos.gz
344
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
345
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
346
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
347
 
                > $(MANDIR)/man8/usplash.8mandos.gz
348
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
349
 
                > $(MANDIR)/man8/splashy.8mandos.gz
350
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
351
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
352
 
 
353
 
install-client: install-client-nokey
 
190
        gzip --best --to-stdout plugins.d/password-request.8mandos \
 
191
                > $(MANDIR)/man8/password-request.8mandos.gz
354
192
# Post-installation stuff
355
193
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
356
194
        update-initramfs -k all -u
360
198
 
361
199
uninstall-server:
362
200
        -rm --force $(PREFIX)/sbin/mandos \
363
 
                $(PREFIX)/sbin/mandos-ctl \
364
 
                $(PREFIX)/sbin/mandos-monitor \
365
201
                $(MANDIR)/man8/mandos.8.gz \
366
202
                $(MANDIR)/man5/mandos.conf.5.gz \
367
203
                $(MANDIR)/man5/mandos-clients.conf.5.gz
372
208
# Refuse to uninstall client if /etc/crypttab is explicitly configured
373
209
# to use it.
374
210
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
375
 
                $(DESTDIR)/etc/crypttab
 
211
                /etc/crypttab
376
212
        -rm --force $(PREFIX)/sbin/mandos-keygen \
377
213
                $(PREFIX)/lib/mandos/plugin-runner \
378
214
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
379
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
215
                $(PREFIX)/lib/mandos/plugins.d/password-request \
380
216
                $(PREFIX)/lib/mandos/plugins.d/usplash \
381
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
382
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
383
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
384
 
                $(INITRAMFSTOOLS)/hooks/mandos \
385
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
386
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
217
                /usr/share/initramfs-tools/hooks/mandos \
 
218
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
219
                /usr/share/initramfs-tools/scripts/local-top/mandos \
387
220
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
388
221
                $(MANDIR)/man8/mandos-keygen.8.gz \
389
222
                $(MANDIR)/man8/password-prompt.8mandos.gz \
390
 
                $(MANDIR)/man8/usplash.8mandos.gz \
391
 
                $(MANDIR)/man8/splashy.8mandos.gz \
392
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
393
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
223
                $(MANDIR)/man8/password-request.8mandos.gz
394
224
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
395
225
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
396
226
        update-initramfs -k all -u
399
229
 
400
230
purge-server: uninstall-server
401
231
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
402
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
403
 
                $(DESTDIR)/etc/default/mandos \
404
 
                $(DESTDIR)/etc/init.d/mandos \
405
 
                $(DESTDIR)/var/run/mandos.pid
 
232
                /etc/default/mandos /etc/init.d/mandos \
 
233
                /var/run/mandos.pid
406
234
        -rmdir $(CONFDIR)
407
235
 
408
236
purge-client: uninstall-client