/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 from trunk; fix small memory leak in plugin-runner.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
16
16
OPTIMIZE=-Os
17
17
LANGUAGE=-std=gnu99
18
18
htmldir=man
19
 
version=1.0.5
 
19
version=1.0.4
20
20
SED=sed
21
21
 
22
22
## Use these settings for a traditional /usr/local install
213
213
 
214
214
# Run the server with a local config
215
215
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
216
        ./mandos --debug --configdir=confdir $(SERVERARGS)
217
217
 
218
218
# Used by run-server
219
219
confdir/mandos.conf: mandos.conf
285
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
287
287
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
289
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
290
290
        gzip --best --to-stdout mandos-keygen.8 \
291
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
332
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
333
                $(INITRAMFSTOOLS)/hooks/mandos \
334
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
336
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \