- Merged OpenBSD CVS changes

[openssh.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a342c9a32492f6d6524170ed49539ad9d4ca64cd..664920d1434e702ed564b4f505293be121ddf5fb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,12 +4,13 @@ bindir=@bindir@
 sbindir=@sbindir@
 libdir=@libdir@
 mandir=@mandir@
+sysconfdir=@sysconfdir@
 
 SSH_PROGRAM=@bindir@/ssh
 ASKPASS_PROGRAM=@libdir@/ssh/ssh-askpass
 
 CC=@CC@
-PATHS=-DETCDIR=\"@sysconfdir@\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DASKPASS_PROGRAM=\"$(ASKPASS_PROGRAM)\"
+PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DASKPASS_PROGRAM=\"$(ASKPASS_PROGRAM)\"
 CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
 EXTRA_TARGETS=@GNOME_ASKPASS@
 TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
@@ -30,7 +31,7 @@ OBJS= authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.o \
 
 all: $(OBJS) $(TARGETS)
 
-libssh.a: authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o hostfile.o match.o mpaux.o nchan.o packet.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o helper.o rc4.o mktemp.o strlcpy.o
+libssh.a: authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o hostfile.o match.o mpaux.o nchan.o packet.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o helper.o rc4.o mktemp.o strlcpy.o log.o fingerprint.o
        $(AR) rv $@ $^
        $(RANLIB) $@
 
@@ -58,32 +59,42 @@ gnome-ssh-askpass: gnome-ssh-askpass.c
 clean:
        rm -f *.o core $(TARGETS) config.status config.cache config.log
 
-install:
+install: all
        install -d $(bindir)
        install -d $(sbindir)
        install -d $(mandir)
        install -d $(mandir)/man1
        install -d $(mandir)/man8
-       install -d $(libdir)/ssh
        install -s -c ssh $(bindir)/ssh
-       ln -sf ssh $(bindir)/slogin
        install -s -c scp $(bindir)/scp
        install -s -c ssh-add $(bindir)/ssh-add
-       if [ -z "@GNOME_ASKPASS@"] ; then
-               install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass
-       else
-               install -m755 -c gnome-ssh-askpass $(libdir)/ssh/ssh-askpass
-       fi
        install -s -c ssh-agent $(bindir)/ssh-agent
        install -s -c ssh-keygen $(bindir)/ssh-keygen
        install -s -c sshd $(sbindir)/sshd
        install -m644 -c ssh.1 $(mandir)/man1/ssh.1
-       ln -sf ssh.1 $(mandir)/man1/slogin.1
        install -m644 -c scp.1 $(mandir)/man1/scp.1
        install -m644 -c ssh-add.1 $(mandir)/man1/ssh-add.1
        install -m644 -c ssh-agent.1 $(mandir)/man1/ssh-agent.1
        install -m644 -c ssh-keygen.1 $(mandir)/man1/ssh-keygen.1
        install -m644 -c sshd.8 $(mandir)/man8/sshd.8
+       ln -sf ssh $(bindir)/slogin
+       ln -sf ssh.1 $(mandir)/man1/slogin.1
+
+       if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \
+               install -d $(libdir) ; \
+               install -d $(libdir)/ssh ; \
+               if [ -z "@GNOME_ASKPASS@" ] ; then \
+                       install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass; \
+               else \
+                       install -m755 -c gnome-ssh-askpass $(libdir)/ssh/ssh-askpass; \
+               fi ; \
+       fi
+
+       if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \
+               install -d $(sysconfdir); \
+               install -m644 ssh_config $(sysconfdir)/ssh_config; \
+               install -m644 sshd_config $(sysconfdir)/sshd_config; \
+       fi
 
 distclean: clean
        rm -f Makefile config.h core *~