- (dtucker) Bug #318: Create ssh_prng_cmds.out during "make" rather than

   "make install".  Patch by roth@feep.net.

diff --git a/ChangeLog b/ChangeLog
index aa682230647781fe7eae3ed54abd2904874c5c85..18a975ad373dfcbb782709be34c74ea01767f2d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030510
+ - (dtucker) Bug #318: Create ssh_prng_cmds.out during "make" rather than
+   "make install".  Patch by roth@feep.net.
+
 20030504
  - (dtucker) Bug #497: Move #include of bsd-cygwin_util.h to openbsd-compat.h.
    Patch from vinschen@redhat.com.
@@ -1370,4 +1374,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2670 2003/05/04 01:36:25 dtucker Exp $
+$Id: ChangeLog,v 1.2671 2003/05/10 06:48:23 dtucker Exp $

diff --git a/Makefile.in b/Makefile.in
index 123bf48cf642c2da1d3ace7e393e96b63ab353fb..23a9d413cd0a4b0b25c9d35b1a561523704af978 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.229 2003/04/29 13:22:40 djm Exp $
+# $Id: Makefile.in,v 1.230 2003/05/10 06:48:23 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -109,7 +109,7 @@ PATHSUBS    = \
 
 FIXPATHSCMD    = $(SED) $(PATHSUBS)
 
-all: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
+all: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
 
 $(LIBSSH_OBJS): config.h
 $(SSHOBJS): config.h
@@ -180,6 +180,11 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
        conffile=`echo $@ | sed 's/.out$$//'`; \
        $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@
 
+ssh_prng_cmds.out:     ssh_prng_cmds
+       if test ! -z "$(INSTALL_SSH_PRNG_CMDS)"; then \
+               $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
+       fi
+
 clean:
        rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
        rm -f *.out core 
@@ -215,8 +220,8 @@ distprep: catman-do
        $(AUTORECONF)
        (cd scard && $(MAKE) -f Makefile.in distprep)
 
-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-config
-install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
+install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config
+install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
 
 check-config:
        -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
@@ -280,7 +285,6 @@ install-files: scard-install
                echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
        fi
        @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
-               $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
                if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
                        $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
                else \