Merge 3.9p1 to the trunk.

1 files changed, 18 insertions, 10 deletions

diff --git a/Makefile.in b/Makefile.in
index 8bff3cb2d..ea0f9c3ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.257 2004/02/18 03:35:11 djm Exp $
+# $Id: Makefile.in,v 1.263 2004/08/15 11:01:37 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -67,22 +67,21 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o buffer.o \
         compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
         log.o match.o moduli.o mpaux.o nchan.o packet.o \
         readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o \
-        atomicio.o key.o dispatch.o kex.o mac.o uuencode.o misc.o \
-        rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \
-        kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
+        atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
+        monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
+        kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
         entropy.o scard-opensc.o gss-genr.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
         sshconnect.o sshconnect1.o sshconnect2.o
 
 SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
-        sshpty.o sshlogin.o servconf.o serverloop.o uidswap.o \
+        sshpty.o sshlogin.o servconf.o serverloop.o \
         auth.o auth1.o auth2.o auth-options.o session.o \
         auth-chall.o auth2-chall.o groupaccess.o \
         auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
         auth2-none.o auth2-passwd.o auth2-pubkey.o \
-        monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \
-        kexdhs.o kexgexs.o \
+        monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \
         auth-krb5.o \
         auth2-gss.o gss-serv.o gss-serv-krb5.o \
         loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o
@@ -200,11 +199,14 @@ clean:	regressclean
 
 distclean:      regressclean
         rm -f *.o *.a $(TARGETS) logintest config.cache config.log
-        rm -f *.out core
-        rm -f Makefile config.h config.status ssh_prng_cmds *~
+        rm -f *.out core opensshd.init
+        rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds *~
         rm -rf autom4te.cache
         (cd openbsd-compat && $(MAKE) distclean)
         (cd scard && $(MAKE) distclean)
+        if test -d pkg ; then \
+                rm -fr pkg ; \
+        fi
 
 veryclean: distclean
         rm -f configure config.h.in *.0
@@ -375,7 +377,7 @@ tests:	$(TARGETS)
         [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
         [ -f `pwd`/regress/Makefile ]  || \
             ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \
-        TEST_SHELL="@TEST_MINUS_S_SH@"; \
+        TEST_SHELL="@TEST_SHELL@"; \
         TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
         TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
         TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
@@ -407,3 +409,9 @@ regressclean:
         if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \
                 (cd regress && $(MAKE) clean) \
         fi
+
+package: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
+        if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \
+                sh buildpkg.sh; \
+        fi
+