/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:
1
 
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
 
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
 
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
 
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
 
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
 
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
8
 
        -Wconversion -Wlogical-op -Waggregate-return \
9
 
        -Wstrict-prototypes -Wold-style-definition \
10
 
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
 
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
 
        -Wvolatile-register-var -Woverlength-strings
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code
13
9
#DEBUG=-ggdb3
14
 
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
10
# For info about _FORTIFY_SOURCE, see
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
15
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
14
LINK_FORTIFY_LD=-z relro -z now
23
20
LINK_FORTIFY += -pie
24
21
endif
25
22
#COVERAGE=--coverage
26
 
OPTIMIZE=-Os -fno-strict-aliasing
 
23
OPTIMIZE=-Os
27
24
LANGUAGE=-std=gnu99
28
25
htmldir=man
29
 
version=1.6.9
 
26
version=1.6.2
30
27
SED=sed
31
28
 
32
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
85
82
        --param man.authors.section.enabled     0 \
86
83
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
87
84
        $(notdir $<); \
 
85
        $(MANPOST) $(notdir $@);\
88
86
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
89
87
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
90
88
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
91
89
        fi >/dev/null)
 
90
# DocBook-to-man post-processing to fix a '\n' escape bug
 
91
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
92
92
 
93
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
94
94
        --param make.year.ranges                1 \
239
239
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
240
240
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
241
241
 
242
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
243
 
        check run-client run-server install install-html \
244
 
        install-server install-client-nokey install-client uninstall \
245
 
        uninstall-server uninstall-client purge purge-server \
246
 
        purge-client
 
242
.PHONY : all doc html clean distclean run-client run-server install \
 
243
        install-server install-client uninstall uninstall-server \
 
244
        uninstall-client purge purge-server purge-client
247
245
 
248
246
clean:
249
247
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
264
262
        @echo "# ignored.  The messages are caused by not running as root, but   #"
265
263
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
266
264
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
267
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
268
 
        @echo "#                     setuid: Operation not permitted             #"
 
265
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
269
266
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
270
 
        @echo "# From mandos-client:                                             #"
271
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
272
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
267
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
268
        @echo "#                     seteuid: Operation not permitted            #"
 
269
        @echo "#                     klogctl: Operation not permitted            #"
273
270
        @echo "###################################################################"
274
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
275
271
        ./plugin-runner --plugin-dir=plugins.d \
276
272
                --config-file=plugin-runner.conf \
277
273
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
278
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
279
274
                $(CLIENTARGS)
280
275
 
281
276
# Used by run-client
296
291
        install --directory confdir
297
292
        install --mode=u=rw $< $@
298
293
# Add a client password
299
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
294
        ./mandos-keygen --dir keydir --password >> $@
300
295
statedir:
301
296
        install --directory statedir
302
297
 
309
304
 
310
305
install-server: doc
311
306
        install --directory $(CONFDIR)
312
 
        if install --directory --mode=u=rwx --owner=$(USER) \
313
 
                --group=$(GROUP) $(STATEDIR); then \
314
 
                :; \
315
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
316
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
317
 
        fi
 
307
        install --directory --mode=u=rwx --owner=$(USER) \
 
308
                --group=$(GROUP) $(STATEDIR)
318
309
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
319
310
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
320
311
                mandos-ctl