/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

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
104
104
        ./mandos --check
105
105
 
106
106
# Run the client with a local config and key
107
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
108
 
        keydir/secring.gpg keydir/pubring.gpg
 
107
run-client: all keydir/seckey.txt keydir/pubkey.txt
109
108
        ./plugin-runner --plugin-dir=plugins.d \
110
109
                --config-file=plugin-runner.conf \
111
110
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
112
111
 
113
112
# Used by run-client
114
 
keydir/secring.gpg: keydir/seckey.txt
115
 
        gpg --homedir $(dir $<) --import $^
116
 
keydir/pubring.gpg: keydir/pubkey.txt
117
 
        gpg --homedir $(dir $<) --import $^
118
113
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
119
114
        install --directory keydir
120
115
        ./mandos-keygen --dir keydir --force
126
121
# Used by run-server
127
122
confdir/mandos.conf: mandos.conf
128
123
        install --directory confdir
129
 
        install $^ $@
 
124
        install --mode=0644 $^ $@
130
125
confdir/clients.conf: clients.conf keydir/seckey.txt
131
126
        install --directory confdir
132
 
        install clients.conf $@
 
127
        install --mode=0640 $< $@
133
128
# Add a client password
134
129
        ./mandos-keygen --dir keydir --password >> $@
135
130