/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
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
 
50
60
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
331
341
                > $(MANDIR)/man8/intro.8mandos.gz
332
342
 
333
343
install-client-nokey: all doc
334
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
344
        install --directory $(LIBDIR)/mandos $(CONFDIR)
335
345
        install --directory --mode=u=rwx $(KEYDIR) \
336
 
                $(PREFIX)/lib/mandos/plugins.d
337
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
346
                $(LIBDIR)/mandos/plugins.d
 
347
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
338
348
                install --mode=u=rwx \
339
349
                        --directory "$(CONFDIR)/plugins.d"; \
340
350
        fi
341
351
        install --mode=u=rwx,go=rx --directory \
342
352
                "$(CONFDIR)/network-hooks.d"
343
353
        install --mode=u=rwx,go=rx \
344
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
354
                --target-directory=$(LIBDIR)/mandos plugin-runner
345
355
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
346
356
                mandos-keygen
347
357
        install --mode=u=rwx,go=rx \
348
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
358
                --target-directory=$(LIBDIR)/mandos/plugins.d \
349
359
                plugins.d/password-prompt
350
360
        install --mode=u=rwxs,go=rx \
351
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
361
                --target-directory=$(LIBDIR)/mandos/plugins.d \
352
362
                plugins.d/mandos-client
353
363
        install --mode=u=rwxs,go=rx \
354
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
364
                --target-directory=$(LIBDIR)/mandos/plugins.d \
355
365
                plugins.d/usplash
356
366
        install --mode=u=rwxs,go=rx \
357
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
367
                --target-directory=$(LIBDIR)/mandos/plugins.d \
358
368
                plugins.d/splashy
359
369
        install --mode=u=rwxs,go=rx \
360
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
370
                --target-directory=$(LIBDIR)/mandos/plugins.d \
361
371
                plugins.d/askpass-fifo
362
372
        install --mode=u=rwxs,go=rx \
363
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
364
374
                plugins.d/plymouth
365
375
        install initramfs-tools-hook \
366
376
                $(INITRAMFSTOOLS)/hooks/mandos
412
422
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
413
423
                $(DESTDIR)/etc/crypttab
414
424
        -rm --force $(PREFIX)/sbin/mandos-keygen \
415
 
                $(PREFIX)/lib/mandos/plugin-runner \
416
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
417
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
418
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
419
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
420
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
421
 
                $(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 \
422
432
                $(INITRAMFSTOOLS)/hooks/mandos \
423
433
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
424
434
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
430
440
                $(MANDIR)/man8/splashy.8mandos.gz \
431
441
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
432
442
                $(MANDIR)/man8/plymouth.8mandos.gz \
433
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
434
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
443
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
444
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
435
445
        update-initramfs -k all -u
436
446
 
437
447
purge: purge-server purge-client