/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: 2019-08-18 00:23:21 UTC
  • Revision ID: teddy@recompile.se-20190818002321-qvjsogu0rhoyuwyc
Use the systemd sysusers.d mechanism, if present

* Makefile (SYSUSERS): New.
  (install-server): Also install sysusers.d file, if $(SYSUSERS)
                    exists.
* debian/mandos.dirs (usr/lib/sysusers.d): New.
* sysusers.d-mandos.conf: New.

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.7
46
47
SED:=sed
 
48
PKG_CONFIG?=pkg-config
47
49
 
48
50
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
49
51
        || getent passwd nobody || echo 65534)))
83
85
        done)
84
86
##
85
87
 
86
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd \
 
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
87
89
                        --variable=systemdsystemunitdir)
88
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
91
                        --variable=tmpfilesdir)
 
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
93
                        --variable=sysusersdir)
89
94
 
90
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
91
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
92
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
93
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
 
95
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
 
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
 
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
 
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
94
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
95
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
96
101
        getconf LFS_LDFLAGS)
97
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
98
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
99
 
GLIB_CFLAGS:=$(shell pkg-config --cflags glib-2.0)
100
 
GLIB_LIBS:=$(shell pkg-config --libs glib-2.0)
 
102
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
 
103
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
 
104
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
 
105
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
101
106
 
102
107
# Do not change these two
103
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
104
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
105
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
106
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
107
112
 
387
392
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
388
393
                        $(TMPFILES)/mandos.conf; \
389
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
390
400
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
391
401
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
392
402
                mandos-ctl