/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: 2011-11-09 17:16:03 UTC
  • mfrom: (518.1.1 mandos-persistent)
  • Revision ID: belorn@fukt.bsnet.se-20111109171603-srz21uoclpldp5ve
merge persistent state

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
250
250
        @echo "###################################################################"
251
251
        ./plugin-runner --plugin-dir=plugins.d \
252
252
                --config-file=plugin-runner.conf \
253
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
253
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
254
254
                $(CLIENTARGS)
255
255
 
256
256
# Used by run-client
260
260
 
261
261
# Run the server with a local config
262
262
run-server: confdir/mandos.conf confdir/clients.conf
263
 
        @echo "#################################################################"
264
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
265
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
266
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
267
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
268
 
        @echo "#################################################################"
269
263
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
270
264
 
271
265
# Used by run-server
324
318
                install --mode=u=rwx \
325
319
                        --directory "$(CONFDIR)/plugins.d"; \
326
320
        fi
327
 
        install --mode=u=rwx,go=rx --directory \
328
 
                "$(CONFDIR)/network-hooks.d"
329
321
        install --mode=u=rwx,go=rx \
330
322
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
331
323
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \