/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-19 23:31:34 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080919233134-h56et87wkgisbk85
* mandos-keygen: New "--passfile" option.  Confirm entered password.

* mandos-keygen.xml (SYNOPSIS, OPTIONS): New "--passfile" option.

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
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
145
 
                $(MANDIR)/man8
 
144
        install --directory $(CONFDIR)
146
145
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
147
146
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
148
147
                mandos.conf
152
151
                $(DESTDIR)/etc/init.d/mandos
153
152
        install --mode=u=rw,go=r default-mandos \
154
153
                $(DESTDIR)/etc/default/mandos
155
 
        update-rc.d mandos defaults
 
154
        if [ -z $(DESTDIR) ]; then update-rc.d mandos defaults; fi
156
155
        gzip --best --to-stdout mandos.8 \
157
156
                > $(MANDIR)/man8/mandos.8.gz
158
157
        gzip --best --to-stdout mandos.conf.5 \
160
159
        gzip --best --to-stdout mandos-clients.conf.5 \
161
160
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
162
161
 
163
 
install-client: all doc $(INITRAMFSTOOLS)/hooks/.
164
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
165
 
                $(MANDIR)/man8
166
 
        install --directory --mode=u=rwx $(KEYDIR)
167
 
        install --directory --mode=u=rwx \
 
162
install-client-nokey: all doc
 
163
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
164
        install --directory --mode=u=rwx $(KEYDIR) \
168
165
                $(PREFIX)/lib/mandos/plugins.d
169
166
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
170
167
                install --mode=u=rwx \
171
 
                        --directory "$(CONFDIR)/plugins.d"; \
172
 
                install --mode=u=rw,go=r etc-plugins.d-README \
173
 
                        $(CONFDIR)/plugins.d/README ; \
 
168
                        --directory "$(CONFDIR)/plugins.d" && \
174
169
        fi
175
170
        install --mode=u=rwx,go=rx \
176
171
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
187
182
                plugins.d/usplash
188
183
        install initramfs-tools-hook \
189
184
                $(INITRAMFSTOOLS)/hooks/mandos
190
 
        install initramfs-tools-hook-conf \
 
185
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
191
186
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
192
187
        install initramfs-tools-script \
193
188
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
200
195
                > $(MANDIR)/man8/password-prompt.8mandos.gz
201
196
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
202
197
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
198
 
 
199
install-client: install-client-nokey
203
200
# Post-installation stuff
204
201
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
205
202
        update-initramfs -k all -u