/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2019-08-18 20:31:35 UTC
  • mfrom: (391 release)
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: teddy@recompile.se-20190818203135-iyzyzin6324altio
Merge from release branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
41
41
#COVERAGE=--coverage
42
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
43
LANGUAGE:=-std=gnu11
 
44
FEATURES:=-D_FILE_OFFSET_BITS=64
44
45
htmldir:=man
45
 
version:=1.8.5
 
46
version:=1.8.8
46
47
SED:=sed
47
48
PKG_CONFIG?=pkg-config
48
49
 
88
89
                        --variable=systemdsystemunitdir)
89
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
90
91
                        --variable=tmpfilesdir)
 
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
93
                        --variable=sysusersdir)
91
94
 
92
95
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
93
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
102
105
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
103
106
 
104
107
# Do not change these two
105
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
106
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
107
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
108
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
109
112
 
389
392
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
390
393
                        $(TMPFILES)/mandos.conf; \
391
394
        fi
 
395
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
396
                        -a -d "$(SYSUSERS)" ]; then \
 
397
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
398
                        $(SYSUSERS)/mandos.conf; \
 
399
        fi
392
400
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
393
401
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
394
402
                mandos-ctl
428
436
        install --directory --mode=u=rwx $(KEYDIR) \
429
437
                $(LIBDIR)/mandos/plugins.d \
430
438
                $(LIBDIR)/mandos/plugin-helpers
 
439
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
440
                        -a -d "$(SYSUSERS)" ]; then \
 
441
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
442
                        $(SYSUSERS)/mandos-client.conf; \
 
443
        fi
431
444
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
432
445
                install --mode=u=rwx \
433
446
                        --directory "$(CONFDIR)/plugins.d" \