/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-10-27 17:42:23 UTC
  • Revision ID: teddy@recompile.se-20131027174223-mq3a1h8xi5jcv9e6
Bug fix: Make sure systemd service file is installed.

* Makefile (install-server): Fix typo causing syntax error.
* debian/mandos.dirs (lib/systemd/system): New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
 
8
#       -Wunreachable-code
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.2
 
26
version=1.6.2
27
27
SED=sed
28
28
 
 
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
30
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
 
31
 
29
32
## Use these settings for a traditional /usr/local install
30
33
# PREFIX=$(DESTDIR)/usr/local
31
34
# CONFDIR=$(DESTDIR)/etc/mandos
32
35
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
36
# MANDIR=$(PREFIX)/man
34
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
35
39
##
36
40
 
37
41
## These settings are for a package-type install
40
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
45
MANDIR=$(PREFIX)/share/man
42
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
43
48
##
44
49
 
 
50
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
51
 
45
52
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
53
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
47
54
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
51
58
        getconf LFS_LDFLAGS)
52
59
 
53
60
# Do not change these two
54
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
61
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
62
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
63
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
64
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
65
 
59
66
# Commands to format a DocBook <refentry> document into a manual page
60
67
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
63
70
        --param make.single.year.ranges         1 \
64
71
        --param man.output.quietly              1 \
65
72
        --param man.authors.section.enabled     0 \
66
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
73
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
74
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
75
        $(MANPOST) $(notdir $@);\
 
76
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
77
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
78
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
79
        fi >/dev/null)
69
80
# DocBook-to-man post-processing to fix a '\n' escape bug
70
81
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
82
 
92
103
        plugins.d/mandos-client.8mandos \
93
104
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
94
105
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
95
 
        plugins.d/plymouth.8mandos
 
106
        plugins.d/plymouth.8mandos intro.8mandos
96
107
 
97
108
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
109
 
119
130
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
131
        $(DOCBOOKTOHTML)
121
132
 
 
133
intro.8mandos: intro.xml common.ent legalnotice.xml
 
134
        $(DOCBOOKTOMAN)
 
135
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
136
        $(DOCBOOKTOHTML)
 
137
 
122
138
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
139
                legalnotice.xml
124
140
        $(DOCBOOKTOMAN)
210
226
                $@)
211
227
 
212
228
plugins.d/mandos-client: plugins.d/mandos-client.c
213
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
214
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
229
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
230
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
215
231
 
216
232
.PHONY : all doc html clean distclean run-client run-server install \
217
233
        install-server install-client uninstall uninstall-server \
223
239
distclean: clean
224
240
mostlyclean: clean
225
241
maintainer-clean: clean
226
 
        -rm --force --recursive keydir confdir
 
242
        -rm --force --recursive keydir confdir statedir
227
243
 
228
244
check:  all
229
245
        ./mandos --check
 
246
        ./mandos-ctl --check
230
247
 
231
248
# Run the client with a local config and key
232
249
run-client: all keydir/seckey.txt keydir/pubkey.txt
243
260
        @echo "###################################################################"
244
261
        ./plugin-runner --plugin-dir=plugins.d \
245
262
                --config-file=plugin-runner.conf \
246
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
263
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
247
264
                $(CLIENTARGS)
248
265
 
249
266
# Used by run-client
252
269
        ./mandos-keygen --dir keydir --force
253
270
 
254
271
# Run the server with a local config
255
 
run-server: confdir/mandos.conf confdir/clients.conf
256
 
        @echo "#################################################################"
257
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
258
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
259
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
260
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
261
 
        @echo "#################################################################"
262
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
272
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
273
        ./mandos --debug --no-dbus --configdir=confdir \
 
274
                --statedir=statedir $(SERVERARGS)
263
275
 
264
276
# Used by run-server
265
277
confdir/mandos.conf: mandos.conf
270
282
        install --mode=u=rw $< $@
271
283
# Add a client password
272
284
        ./mandos-keygen --dir keydir --password >> $@
 
285
statedir:
 
286
        install --directory statedir
273
287
 
274
288
install: install-server install-client-nokey
275
289
 
280
294
 
281
295
install-server: doc
282
296
        install --directory $(CONFDIR)
 
297
        install --directory --mode=u=rwx --owner=$(USER) \
 
298
                --group=$(GROUP) $(STATEDIR)
283
299
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
284
300
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
285
301
                mandos-ctl
293
309
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
294
310
        install --mode=u=rwx,go=rx init.d-mandos \
295
311
                $(DESTDIR)/etc/init.d/mandos
 
312
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
313
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
314
        fi
296
315
        install --mode=u=rw,go=r default-mandos \
297
316
                $(DESTDIR)/etc/default/mandos
298
317
        if [ -z $(DESTDIR) ]; then \
308
327
                > $(MANDIR)/man5/mandos.conf.5.gz
309
328
        gzip --best --to-stdout mandos-clients.conf.5 \
310
329
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
330
        gzip --best --to-stdout intro.8mandos \
 
331
                > $(MANDIR)/man8/intro.8mandos.gz
311
332
 
312
333
install-client-nokey: all doc
313
334
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
317
338
                install --mode=u=rwx \
318
339
                        --directory "$(CONFDIR)/plugins.d"; \
319
340
        fi
 
341
        install --mode=u=rwx,go=rx --directory \
 
342
                "$(CONFDIR)/network-hooks.d"
320
343
        install --mode=u=rwx,go=rx \
321
344
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
322
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
418
441
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
419
442
                $(DESTDIR)/etc/default/mandos \
420
443
                $(DESTDIR)/etc/init.d/mandos \
 
444
                $(SYSTEMD)/mandos.service \
 
445
                $(DESTDIR)/run/mandos.pid \
421
446
                $(DESTDIR)/var/run/mandos.pid
422
447
        -rmdir $(CONFDIR)
423
448