/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2008-09-12 19:12:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080912191240-edjlcll43eoijkx0
* Makefile (install): Use "install-client-nokey".
  (install-server): Create "/etc/default" and "/usr/sbin", too.
  (install-client): Do not depend on "$(INITRAMFSTOOLS)/hooks/.".
                    Renamed to "install-client-nokey".  Split out
                    post-installation-stuff to new "install-client"
                    target.

* mandos-clients.conf.xml: White space adjustments.
* mandos-keygen.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.xml: - '' -
* plugins.d/mandos-client.xml: - '' -

* overview.xml: Improved grammar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
9
 
DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
 
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
12
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
16
16
 
17
17
## Use these settings for a traditional /usr/local install
18
18
# PREFIX=$(DESTDIR)/usr/local
19
 
# CONFDIR=$(PREFIX)/lib/mandos
20
 
# KEYDIR=$(PREFIX)/lib/mandos/keys
 
19
# CONFDIR=$(DESTDIR)/etc/mandos
 
20
# KEYDIR=$(DESTDIR)/etc/mandos/keys
21
21
# MANDIR=$(PREFIX)/man
22
 
# INITRAMFSTOOLS=/etc/initramfs-tools
 
22
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
23
##
23
24
 
 
25
## These settings are for a package-type install
24
26
PREFIX=$(DESTDIR)/usr
25
27
CONFDIR=$(DESTDIR)/etc/mandos
26
28
KEYDIR=$(DESTDIR)/etc/keys/mandos
27
29
MANDIR=$(PREFIX)/share/man
28
30
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
31
##
29
32
 
30
33
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
31
34
GNUTLS_LIBS=$(shell libgnutls-config --libs)
135
138
# Add a client password
136
139
        ./mandos-keygen --dir keydir --password >> $@
137
140
 
138
 
install: install-server install-client
 
141
install: install-server install-client-nokey
139
142
 
140
143
install-server: doc
141
144
        install --directory $(CONFDIR) $(MANDIR)/man5 \
142
 
                $(MANDIR)/man8
 
145
                $(MANDIR)/man8 $(DESTDIR)/etc/init.d \
 
146
                $(DESTDIR)/etc/default $(PREFIX)/sbin
143
147
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
144
148
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
145
149
                mandos.conf
157
161
        gzip --best --to-stdout mandos-clients.conf.5 \
158
162
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
159
163
 
160
 
install-client: all doc $(INITRAMFSTOOLS)/hooks/.
 
164
install-client-nokey: all doc
161
165
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
162
 
                $(MANDIR)/man8
 
166
                $(MANDIR)/man8 $(PREFIX)/sbin \
 
167
                $(INITRAMFSTOOLS)/hooks \
 
168
                $(INITRAMFSTOOLS)/conf-hooks.d \
 
169
                $(INITRAMFSTOOLS)/scripts/local-top
163
170
        install --directory --mode=u=rwx $(KEYDIR)
164
171
        install --directory --mode=u=rwx \
165
172
                $(PREFIX)/lib/mandos/plugins.d
197
204
                > $(MANDIR)/man8/password-prompt.8mandos.gz
198
205
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
199
206
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
207
 
 
208
install-client: install-client-nokey
200
209
# Post-installation stuff
201
210
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
202
211
        update-initramfs -k all -u