/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-24 23:03:31 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080924230331-2qvhppypeo852ksr
* Makefile (PLUGINS): Added "plugins.d/usplash".
  (install-client-nokey): Add setuid bit on "plugins.d/usplash".

* plugins.d/splashy.c (main): Move "sret" to top.

* plugins.d/usplash: Removed.
* plugins.d/usplash.c: New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
55
55
# DocBook-to-man post-processing to fix a '\n' escape bug
56
56
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
57
57
 
58
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
 
58
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
59
        plugins.d/usplash plugins.d/splashy
59
60
PROGS=plugin-runner $(PLUGINS)
60
61
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
61
62
        plugins.d/mandos-client.8mandos \
151
152
                $(DESTDIR)/etc/init.d/mandos
152
153
        install --mode=u=rw,go=r default-mandos \
153
154
                $(DESTDIR)/etc/default/mandos
154
 
        update-rc.d mandos defaults
 
155
        if [ -z $(DESTDIR) ]; then \
 
156
                update-rc.d mandos defaults 25 15;\
 
157
        fi
155
158
        gzip --best --to-stdout mandos.8 \
156
159
                > $(MANDIR)/man8/mandos.8.gz
157
160
        gzip --best --to-stdout mandos.conf.5 \
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" && \
169
 
                install --mode=u=rw,go=r etc-plugins.d-README \
170
 
                        $(CONFDIR)/plugins.d/README ; \
 
171
                        --directory "$(CONFDIR)/plugins.d"; \
171
172
        fi
172
173
        install --mode=u=rwx,go=rx \
173
174
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
179
180
        install --mode=u=rwxs,go=rx \
180
181
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
181
182
                plugins.d/mandos-client
182
 
        install --mode=u=rwx,go=rx \
 
183
        install --mode=u=rwxs,go=rx \
183
184
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
184
185
                plugins.d/usplash
 
186
        install --mode=u=rwxs,go=rx \
 
187
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
188
                plugins.d/splashy
185
189
        install initramfs-tools-hook \
186
190
                $(INITRAMFSTOOLS)/hooks/mandos
187
191
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
224
228
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
225
229
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
226
230
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
231
                $(PREFIX)/lib/mandos/plugins.d/splashy \
227
232
                $(INITRAMFSTOOLS)/hooks/mandos \
228
233
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
229
234
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \