/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-13 15:36:18 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080913153618-atp386q2bqj0ku99
* Makefile (install-client-nokey): Do "&&" instead of ";" to catch
                                   errors.

* README: Kill the straight quotes.  Add copyright notice.

* overview.xml: Improved wording.

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