/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-06-23 15:13:06 UTC
Revision ID: teddy@recompile.se-20130623151306-3y4zwy76d95hcvpq

* mandos: Bug fix: Make boolean options work from the config file
          again.
          Bug fix: Make --no-ipv6 work again.
          Bug fix: Add extra magic to GnuTLS priority to make it work
          with current version of GnuTLS.
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -
* plugins.d/mandos-client.xml (EXAMPLE): Minor grammar fix.

Show diffs side-by-side

added added

removed removed

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 \

436

436

$(DESTDIR)/etc/dbus-1/system.d/mandos.conf

437

437

$(DESTDIR)/etc/default/mandos \

438

438

$(DESTDIR)/etc/init.d/mandos \

439

$(DESTDIR)/run/mandos.pid

439

$(DESTDIR)/var/run/mandos.pid

440

440

-rmdir $(CONFDIR)

441

441

442

442

purge-client: uninstall-client

Older »