/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: 2008-08-24 06:17:02 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080824061702-zxrru4r1vxmx4tuq
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
  (install-server, install-client): Use "install --directory" instead
                                    of mkdir.

* mandos-keygen: New options --subtype and --sublength.
  (trap): Added semicolons and backslashes.
  (gpg): Added "--enable-dsa2" to all invocations.

* mandos-keygen.xml: Changed single quotes to double quotes for
                     consistency.
  (/refentry/refentryinfo/copyright) Split copyright holders.
  (SYNOPSIS): Added "--subtype", "--sublength", "-s", and "-L".
  (OPTIONS): Document the subtype and sublength options.
  (SECURITY): Also note the "--subtype" and "--sublength" options.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
14
14
OPTIMIZE=-Os
15
15
LANGUAGE=-std=gnu99
16
16
# PREFIX=/usr/local
17
 
PREFIX=/usr
 
17
PREFIX=$(DESTDIR)/usr
18
18
# CONFDIR=/usr/local/lib/mandos
19
 
CONFDIR=/etc/mandos
 
19
CONFDIR=$(DESTDIR)/etc/mandos
20
20
# MANDIR=/usr/local/man
21
 
MANDIR=/usr/share/man
 
21
MANDIR=$(DESTDIR)/usr/share/man
22
22
 
23
23
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
24
GNUTLS_LIBS=$(shell libgnutls-config --libs)
104
104
install: install-server install-client
105
105
 
106
106
install-server: doc
107
 
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
 
107
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
108
108
                $(MANDIR)/man8
109
109
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
110
110
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
118
118
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
119
119
 
120
120
install-client: all doc /usr/share/initramfs-tools/hooks/.
121
 
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
122
 
                $(MANDIR)/man8
123
 
        -mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
121
        install --directory --parents $(PREFIX)/lib/mandos \
 
122
                $(CONFDIR) $(MANDIR)/man8
 
123
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
124
124
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
125
125
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
126
126
                plugin-runner