/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 debian/rules

  • 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:
debian/rules
19
19
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client \
20
20
                install-client-nokey
21
21
 
22
 
override_dh_fixperms-arch:
 
22
override_dh_fixperms:
23
23
        dh_fixperms --exclude etc/keys/mandos \
 
24
                --exclude etc/mandos/clients.conf \
24
25
                --exclude etc/mandos/plugins.d \
25
 
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugins.d \
 
26
                --exclude usr/lib/mandos/plugins.d \
26
27
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
27
28
        chmod --recursive g-w -- \
28
29
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"
29
 
 
30
 
override_dh_fixperms-indep:
31
 
        dh_fixperms --exclude etc/mandos/clients.conf
32
 
 
33
 
override_dh_auto_test-arch: ;