- (djm) Don't generate host keys when $(DESTDIR) is set (e.g. during RPM

[openssh.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0dc71c6cd1361dfaf2a89d4b56345a5f82112c3e..23e2bce8fdb7c0822ff5783b903ccbef7ad74b6d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,11 +36,11 @@ TARGETS=ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
 
 LIBSSH_OBJS=atomicio.o authfd.o authfile.o aux.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dispatch.o dsa.o fingerprint.o hmac.o hostfile.o key.o kex.o log.o match.o mpaux.o nchan.o packet.o radix.o entropy.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o 
 
-LIBOPENBSD_COMPAT_OBJS=bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-setenv.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o fake-getaddrinfo.o fake-getnameinfo.o 
+LIBOPENBSD_COMPAT_OBJS=bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-inet_aton.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-setenv.o bsd-sigaction.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o fake-getaddrinfo.o fake-getnameinfo.o next-posix.o
 
 SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o
 
-SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-rhosts.o auth-krb4.o auth-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o md5crypt.o session.o
+SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o loginrec.o servconf.o serverloop.o md5crypt.o session.o
 
 TROFFMAN       = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8
 CATMAN         = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh.0 sshd.0
@@ -86,11 +86,15 @@ ssh-agent: libopenbsd-compat.a libssh.a ssh-agent.o log-client.o
 ssh-keygen: libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o
        $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
+# test driver for the loginrec code - not built by default
+logintest: logintest.o libopenbsd-compat.a libssh.a log-client.o loginrec.o
+       $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh log-client.o $(LIBS)
+
 $(MANPAGES) $(CONFIGFILES)::
        $(FIXPATHSCMD) $(srcdir)/$@
 
 clean:
-       rm -f *.o *.a $(TARGETS) config.cache config.log 
+       rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
        rm -f *.out core
 
 distclean: clean
@@ -108,12 +112,17 @@ catman-do:
                        >$${f%%.[18]}.0 ; \
        done
 
-install: manpages $(TARGETS)
-       $(INSTALL) -d $(DESTDIR)$(bindir)
-       $(INSTALL) -d $(DESTDIR)$(sbindir)
-       $(INSTALL) -d $(DESTDIR)$(mandir)
-       $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)1
-       $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)8
+distprep: catman-do
+       autoreconf
+
+install: manpages $(TARGETS) install-files host-key
+
+install-files:
+       ./mkinstalldirs $(DESTDIR)$(bindir)
+       ./mkinstalldirs $(DESTDIR)$(sbindir)
+       ./mkinstalldirs $(DESTDIR)$(mandir)
+       ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
+       ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
        $(INSTALL) -m 4755 -s ssh $(DESTDIR)$(bindir)/ssh
        $(INSTALL) -s scp $(DESTDIR)$(bindir)/scp
        $(INSTALL) -s ssh-add $(DESTDIR)$(bindir)/ssh-add
@@ -130,9 +139,8 @@ install: manpages $(TARGETS)
        ln -s ssh $(DESTDIR)$(bindir)/slogin
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
        ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
-
        if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
-               $(INSTALL) -d $(DESTDIR)$(sysconfdir); \
+               ./mkinstalldirs $(DESTDIR)$(sysconfdir); \
                $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
                $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
        fi
@@ -142,8 +150,22 @@ install: manpages $(TARGETS)
        fi
 
 host-key: ssh-keygen
-       ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N ""
-       ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N ""
+       if [ -z "$(DESTDIR)" ] ; then \
+               if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \
+                       echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \
+               else \
+                       ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \
+               fi ; \
+               if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \
+                       echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \
+               else \
+                       ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \
+               fi ; \
+       fi ;
+
+host-key-force: ssh-keygen
+       ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
+       ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
 
 uninstallall:  uninstall
        -rm -f $(DESTDIR)$(sysconfdir)/ssh_config