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

diff --git a/CREDITS b/CREDITS
index 4b5cfdb79c04bf21100c7f20d929d3d4fbb9f759..c591e5c7da461ae5f2d3fe9878f7c79aa6325b78 100644 (file)
--- 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

diff --git a/ChangeLog b/ChangeLog
index 22b5aabd3d5ab95fcb0f617381f04551eeb7abf4..687c98b85c54d7286ef7f31edd4a6d006c2f5184 100644 (file)
--- 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.

diff --git a/Makefile.in b/Makefile.in
index d1234c563081591719f18962c252f6443d14f257..d20bfca54efa0b60b0ef483b0827bd5d3ce96378 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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)