/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 15:42:11 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080907154211-sc90y38lazc4ewfq
* initramfs-tools-script: Fix permissions of "/tmp" in initrd.

* plugin-runner.c (parse_opt): Ignore empty argument strings.

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