- (djm) Makefile correctness fix from Mark D. Baushke <mdb@juniper.net>

3 files changed, 15 insertions, 11 deletions

diff --git a/CREDITS b/CREDITS
index 00def351c..a05cbe2b4 100644
--- a/CREDITS
+++ b/CREDITS
@@ -54,6 +54,7 @@ Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes
 Larry Jones <larry.jones@sdrc.com> - Bugfixes
 Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes
 Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches
+Mark D. Baushke <mdb@juniper.net> - bug fixes
 Martin Johansson <fatbob@acc.umu.se> - Linux fixes
 Mark D. Roth <roth+openssh@feep.net> - Features, bug fixes
 Mark Miller <markm@swoon.net> - Bugfixes
@@ -88,5 +89,5 @@ Apologies to anyone I have missed.
 
 Damien Miller <djm@mindrot.org>
 
-$Id: CREDITS,v 1.62 2001/04/16 00:41:46 djm Exp $
+$Id: CREDITS,v 1.63 2001/11/11 23:34:22 djm Exp $
 
diff --git a/ChangeLog b/ChangeLog
index b2f58c36e..8dc679a6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20011112
+ - (djm) Makefile correctness fix from Mark D. Baushke <mdb@juniper.net>
+
 20011109
  - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
    if permit_empty_passwd == 0 so null password check cannot be bypassed.
@@ -6806,4 +6809,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1632 2001/11/09 20:22:16 stevesk Exp $
+$Id: ChangeLog,v 1.1633 2001/11/11 23:34:22 djm Exp $
diff --git a/Makefile.in b/Makefile.in
index 9bf8a425c..f484dc3a0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.189 2001/10/22 00:53:59 tim Exp $
+# $Id: Makefile.in,v 1.190 2001/11/11 23:34:23 djm Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -87,7 +87,7 @@ $(SSHDOBJS): config.h
 
 LIBCOMPAT=openbsd-compat/libopenbsd-compat.a
 $(LIBCOMPAT): always
-        (cd openbsd-compat; $(MAKE))
+        (cd openbsd-compat && $(MAKE))
 always:
 
 libssh.a: $(LIBSSH_OBJS)
@@ -144,23 +144,23 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
 clean:
         rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
         rm -f *.out core 
-        (cd openbsd-compat; $(MAKE) clean)
+        (cd openbsd-compat && $(MAKE) clean)
 
 distclean:
         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 -rf autom4te.cache
-        (cd openbsd-compat; $(MAKE) distclean)
-        (cd scard; $(MAKE) distclean)
+        (cd openbsd-compat && $(MAKE) distclean)
+        (cd scard && $(MAKE) distclean)
 
 veryclean:
         rm -f configure config.h.in *.0
         rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
         rm -f *.out core
         rm -f Makefile config.h config.status ssh_prng_cmds *~
-        (cd openbsd-compat; $(MAKE) distclean)
-        (cd scard; $(MAKE) distclean)
+        (cd openbsd-compat && $(MAKE) distclean)
+        (cd scard && $(MAKE) distclean)
 
 mrproper: distclean
 
@@ -174,13 +174,13 @@ catman-do:
 
 distprep: catman-do
         autoreconf
-        (cd scard ; $(MAKE) -f Makefile.in distprep)
+        (cd scard && $(MAKE) -f Makefile.in distprep)
 
 install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
 install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
 
 scard-install:
-        (cd scard; $(MAKE) DESTDIR=$(DESTDIR) install)
+        (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)
 
 install-files: scard-install
         $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)