/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-09-07 09:36:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080907093635-yg1y272yv53dijhp
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
                      /usr/local install and a package install.
  (KEYDIR): Changed /usr/local install value to be "/etc/mandos/keys".
  (INITRAMFSTOOLS): Use $(DESTDIR) in /usr/local value too.

* initramfs-tools-hook: Look in "/etc/mandos/keys" too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
138
138
# Add a client password
139
139
        ./mandos-keygen --dir keydir --password >> $@
140
140
 
141
 
install: install-server install-client-nokey
 
141
install: install-server install-client
142
142
 
143
143
install-server: doc
144
144
        install --directory $(CONFDIR) $(MANDIR)/man5 \
145
 
                $(MANDIR)/man8 $(DESTDIR)/etc/init.d \
146
 
                $(DESTDIR)/etc/default $(PREFIX)/sbin
 
145
                $(MANDIR)/man8
147
146
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
148
147
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
149
148
                mandos.conf
161
160
        gzip --best --to-stdout mandos-clients.conf.5 \
162
161
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
163
162
 
164
 
install-client-nokey: all doc
 
163
install-client: all doc $(INITRAMFSTOOLS)/hooks/.
165
164
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
166
 
                $(MANDIR)/man8 $(PREFIX)/sbin \
167
 
                $(INITRAMFSTOOLS)/hooks \
168
 
                $(INITRAMFSTOOLS)/conf-hooks.d \
169
 
                $(INITRAMFSTOOLS)/scripts/local-top
 
165
                $(MANDIR)/man8
170
166
        install --directory --mode=u=rwx $(KEYDIR)
171
167
        install --directory --mode=u=rwx \
172
168
                $(PREFIX)/lib/mandos/plugins.d
173
169
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
174
170
                install --mode=u=rwx \
175
 
                        --directory "$(CONFDIR)/plugins.d" && \
 
171
                        --directory "$(CONFDIR)/plugins.d"; \
176
172
                install --mode=u=rw,go=r etc-plugins.d-README \
177
173
                        $(CONFDIR)/plugins.d/README ; \
178
174
        fi
204
200
                > $(MANDIR)/man8/password-prompt.8mandos.gz
205
201
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
206
202
                > $(MANDIR)/man8/mandos-client.8mandos.gz
207
 
 
208
 
install-client: install-client-nokey
209
203
# Post-installation stuff
210
204
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
211
205
        update-initramfs -k all -u