diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | Makefile.in | 14 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20030510 | ||
2 | - (dtucker) Bug #318: Create ssh_prng_cmds.out during "make" rather than | ||
3 | "make install". Patch by roth@feep.net. | ||
4 | |||
1 | 20030504 | 5 | 20030504 |
2 | - (dtucker) Bug #497: Move #include of bsd-cygwin_util.h to openbsd-compat.h. | 6 | - (dtucker) Bug #497: Move #include of bsd-cygwin_util.h to openbsd-compat.h. |
3 | Patch from vinschen@redhat.com. | 7 | Patch from vinschen@redhat.com. |
@@ -1370,4 +1374,4 @@ | |||
1370 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1374 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1371 | ok provos@ | 1375 | ok provos@ |
1372 | 1376 | ||
1373 | $Id: ChangeLog,v 1.2670 2003/05/04 01:36:25 dtucker Exp $ | 1377 | $Id: ChangeLog,v 1.2671 2003/05/10 06:48:23 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index 123bf48cf..23a9d413c 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.229 2003/04/29 13:22:40 djm Exp $ | 1 | # $Id: Makefile.in,v 1.230 2003/05/10 06:48:23 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -109,7 +109,7 @@ PATHSUBS = \ | |||
109 | 109 | ||
110 | FIXPATHSCMD = $(SED) $(PATHSUBS) | 110 | FIXPATHSCMD = $(SED) $(PATHSUBS) |
111 | 111 | ||
112 | all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) | 112 | all: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) |
113 | 113 | ||
114 | $(LIBSSH_OBJS): config.h | 114 | $(LIBSSH_OBJS): config.h |
115 | $(SSHOBJS): config.h | 115 | $(SSHOBJS): config.h |
@@ -180,6 +180,11 @@ $(CONFIGFILES): $(CONFIGFILES_IN) | |||
180 | conffile=`echo $@ | sed 's/.out$$//'`; \ | 180 | conffile=`echo $@ | sed 's/.out$$//'`; \ |
181 | $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@ | 181 | $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@ |
182 | 182 | ||
183 | ssh_prng_cmds.out: ssh_prng_cmds | ||
184 | if test ! -z "$(INSTALL_SSH_PRNG_CMDS)"; then \ | ||
185 | $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ | ||
186 | fi | ||
187 | |||
183 | clean: | 188 | clean: |
184 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 189 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
185 | rm -f *.out core | 190 | rm -f *.out core |
@@ -215,8 +220,8 @@ distprep: catman-do | |||
215 | $(AUTORECONF) | 220 | $(AUTORECONF) |
216 | (cd scard && $(MAKE) -f Makefile.in distprep) | 221 | (cd scard && $(MAKE) -f Makefile.in distprep) |
217 | 222 | ||
218 | install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-config | 223 | install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config |
219 | install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files | 224 | install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files |
220 | 225 | ||
221 | check-config: | 226 | check-config: |
222 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config | 227 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config |
@@ -280,7 +285,6 @@ install-files: scard-install | |||
280 | echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ | 285 | echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ |
281 | fi | 286 | fi |
282 | @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ | 287 | @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ |
283 | $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ | ||
284 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ | 288 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ |
285 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ | 289 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ |
286 | else \ | 290 | else \ |