/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: Björn Påhlsson
  • Date: 2010-09-09 22:06:10 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: belorn@fukt.bsnet.se-20100909220610-fcpkaykznlq22oaw
minor debug info for plugin-runner.
Commit before merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
83
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
84
 
85
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
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
87
CPROGS=plugin-runner $(PLUGINS)
89
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
210
209
 
211
210
# Run the client with a local config and key
212
211
run-client: all keydir/seckey.txt keydir/pubkey.txt
213
 
        @echo "###################################################################"
214
 
        @echo "# The following error messages are harmless and can be safely     #"
215
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
216
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
217
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
218
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
219
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
220
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
221
 
        @echo "#                     seteuid: Operation not permitted            #"
222
 
        @echo "#                     klogctl: Operation not permitted            #"
223
 
        @echo "###################################################################"
224
212
        ./plugin-runner --plugin-dir=plugins.d \
225
213
                --config-file=plugin-runner.conf \
226
214
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
233
221
 
234
222
# Run the server with a local config
235
223
run-server: confdir/mandos.conf confdir/clients.conf
236
 
        @echo "#################################################################"
237
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
238
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
239
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
240
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
241
 
        @echo "#################################################################"
242
224
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
243
225
 
244
226
# Used by run-server
265
247
                mandos.conf
266
248
        install --mode=u=rw --target-directory=$(CONFDIR) \
267
249
                clients.conf
268
 
        install --mode=u=rw,go=r dbus-mandos.conf \
269
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
270
250
        install --mode=u=rwx,go=rx init.d-mandos \
271
251
                $(DESTDIR)/etc/init.d/mandos
272
252
        install --mode=u=rw,go=r default-mandos \
308
288
        install --mode=u=rwxs,go=rx \
309
289
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
310
290
                plugins.d/askpass-fifo
311
 
        install --mode=u=rwxs,go=rx \
312
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
313
 
                plugins.d/plymouth
314
291
        install initramfs-tools-hook \
315
292
                $(INITRAMFSTOOLS)/hooks/mandos
316
293
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
361
338
                $(PREFIX)/lib/mandos/plugins.d/usplash \
362
339
                $(PREFIX)/lib/mandos/plugins.d/splashy \
363
340
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
364
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
365
341
                $(INITRAMFSTOOLS)/hooks/mandos \
366
342
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
367
343
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
380
356
 
381
357
purge-server: uninstall-server
382
358
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
383
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
384
359
                $(DESTDIR)/etc/default/mandos \
385
360
                $(DESTDIR)/etc/init.d/mandos \
386
361
                $(DESTDIR)/var/run/mandos.pid