/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: 2013-08-27 21:47:35 UTC
  • Revision ID: teddy@recompile.se-20130827214735-8r7bsaqjvkx2h97c
* plugin-runner.c (main): Bug fix; do not ignore return value of
                          setgid().
* plugins.d/mandos-client.c (main): Bug fix: sleep() takes an unsigned
                                    int, not an int.
* plugins.d/plymouth.c (exec_and_wait, getargv, main/plymouthd_argv):
                       Add more const-ness to the argv pointer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.6.1
 
26
version=1.6.0
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
56
56
        getconf LFS_LDFLAGS)
57
57
 
58
58
# Do not change these two
59
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
61
        -DVERSION='"$(version)"'
62
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
62
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
63
 
64
64
# Commands to format a DocBook <refentry> document into a manual page
65
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
339
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
340
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
341
                mandos-keygen
342
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
343
 
                mandos-change-keytype
344
342
        install --mode=u=rwx,go=rx \
345
343
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
346
344
                plugins.d/password-prompt
409
407
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
410
408
                $(DESTDIR)/etc/crypttab
411
409
        -rm --force $(PREFIX)/sbin/mandos-keygen \
412
 
                $(PREFIX)/sbin/mandos-change-keytype \
413
410
                $(PREFIX)/lib/mandos/plugin-runner \
414
411
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
415
412
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
439
436
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
440
437
                $(DESTDIR)/etc/default/mandos \
441
438
                $(DESTDIR)/etc/init.d/mandos \
442
 
                $(DESTDIR)/run/mandos.pid
 
439
                $(DESTDIR)/var/run/mandos.pid
443
440
        -rmdir $(CONFDIR)
444
441
 
445
442
purge-client: uninstall-client