/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-28 08:38:47 UTC
  • Revision ID: teddy@recompile.se-20131028083847-cper3srg5o29r2ge
Use architecture libdir.

Instead of always using /usr/lib/mandos, use whatever the architecture
specifies, like /usr/lib/x86_64-linux-gnu/mandos or /usr/lib64/mandos.
Still use /usr/lib/mandos as a fallback.

* Makefile (LIBDIR): New.
 (install-client-nokey, uninstall-client): Use LIBDIR instead of
                                           $(PREFIX)/lib.
* initramfs-tools-hook: Detect correct libdir and copy from there.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

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.5.2
 
26
version=1.6.2
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
36
36
# MANDIR=$(PREFIX)/man
37
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
39
# LIBDIR=$(PREFIX)/lib
39
40
##
40
41
 
41
42
## These settings are for a package-type install
45
46
MANDIR=$(PREFIX)/share/man
46
47
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
48
STATEDIR=$(DESTDIR)/var/lib/mandos
 
49
LIBDIR=$(shell \
 
50
        for d in \
 
51
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
52
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
53
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
54
                        echo "$(DESTDIR)$$d"; \
 
55
                        break; \
 
56
                fi; \
 
57
        done)
48
58
##
49
59
 
 
60
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
61
 
50
62
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
63
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
64
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
56
68
        getconf LFS_LDFLAGS)
57
69
 
58
70
# Do not change these two
59
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
71
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
72
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
73
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
74
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
75
 
64
76
# Commands to format a DocBook <refentry> document into a manual page
65
77
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
68
80
        --param make.single.year.ranges         1 \
69
81
        --param man.output.quietly              1 \
70
82
        --param man.authors.section.enabled     0 \
71
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
83
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
84
        $(notdir $<); \
73
85
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
86
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
87
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
88
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
89
        fi >/dev/null)
76
90
# DocBook-to-man post-processing to fix a '\n' escape bug
77
91
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
92
 
239
253
 
240
254
check:  all
241
255
        ./mandos --check
 
256
        ./mandos-ctl --check
242
257
 
243
258
# Run the client with a local config and key
244
259
run-client: all keydir/seckey.txt keydir/pubkey.txt
264
279
        ./mandos-keygen --dir keydir --force
265
280
 
266
281
# Run the server with a local config
267
 
run-server: confdir/mandos.conf confdir/clients.conf
 
282
run-server: confdir/mandos.conf confdir/clients.conf statedir
268
283
        ./mandos --debug --no-dbus --configdir=confdir \
269
284
                --statedir=statedir $(SERVERARGS)
270
285
 
304
319
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
305
320
        install --mode=u=rwx,go=rx init.d-mandos \
306
321
                $(DESTDIR)/etc/init.d/mandos
 
322
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
323
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
324
        fi
307
325
        install --mode=u=rw,go=r default-mandos \
308
326
                $(DESTDIR)/etc/default/mandos
309
327
        if [ -z $(DESTDIR) ]; then \
323
341
                > $(MANDIR)/man8/intro.8mandos.gz
324
342
 
325
343
install-client-nokey: all doc
326
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
344
        install --directory $(LIBDIR)/mandos $(CONFDIR)
327
345
        install --directory --mode=u=rwx $(KEYDIR) \
328
 
                $(PREFIX)/lib/mandos/plugins.d
329
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
346
                $(LIBDIR)/mandos/plugins.d
 
347
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
330
348
                install --mode=u=rwx \
331
349
                        --directory "$(CONFDIR)/plugins.d"; \
332
350
        fi
333
351
        install --mode=u=rwx,go=rx --directory \
334
352
                "$(CONFDIR)/network-hooks.d"
335
353
        install --mode=u=rwx,go=rx \
336
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
354
                --target-directory=$(LIBDIR)/mandos plugin-runner
337
355
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
338
356
                mandos-keygen
339
357
        install --mode=u=rwx,go=rx \
340
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
358
                --target-directory=$(LIBDIR)/mandos/plugins.d \
341
359
                plugins.d/password-prompt
342
360
        install --mode=u=rwxs,go=rx \
343
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
361
                --target-directory=$(LIBDIR)/mandos/plugins.d \
344
362
                plugins.d/mandos-client
345
363
        install --mode=u=rwxs,go=rx \
346
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
364
                --target-directory=$(LIBDIR)/mandos/plugins.d \
347
365
                plugins.d/usplash
348
366
        install --mode=u=rwxs,go=rx \
349
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
367
                --target-directory=$(LIBDIR)/mandos/plugins.d \
350
368
                plugins.d/splashy
351
369
        install --mode=u=rwxs,go=rx \
352
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
370
                --target-directory=$(LIBDIR)/mandos/plugins.d \
353
371
                plugins.d/askpass-fifo
354
372
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
356
374
                plugins.d/plymouth
357
375
        install initramfs-tools-hook \
358
376
                $(INITRAMFSTOOLS)/hooks/mandos
404
422
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
405
423
                $(DESTDIR)/etc/crypttab
406
424
        -rm --force $(PREFIX)/sbin/mandos-keygen \
407
 
                $(PREFIX)/lib/mandos/plugin-runner \
408
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
409
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
410
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
411
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
412
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
413
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
425
                $(LIBDIR)/mandos/plugin-runner \
 
426
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
427
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
428
                $(LIBDIR)/mandos/plugins.d/usplash \
 
429
                $(LIBDIR)/mandos/plugins.d/splashy \
 
430
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
431
                $(LIBDIR)/mandos/plugins.d/plymouth \
414
432
                $(INITRAMFSTOOLS)/hooks/mandos \
415
433
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
416
434
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
422
440
                $(MANDIR)/man8/splashy.8mandos.gz \
423
441
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
424
442
                $(MANDIR)/man8/plymouth.8mandos.gz \
425
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
426
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
443
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
444
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
427
445
        update-initramfs -k all -u
428
446
 
429
447
purge: purge-server purge-client
433
451
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
434
452
                $(DESTDIR)/etc/default/mandos \
435
453
                $(DESTDIR)/etc/init.d/mandos \
 
454
                $(SYSTEMD)/mandos.service \
 
455
                $(DESTDIR)/run/mandos.pid \
436
456
                $(DESTDIR)/var/run/mandos.pid
437
457
        -rmdir $(CONFDIR)
438
458