From: djm <djm>
Date: Sun, 11 Nov 2001 23:34:22 +0000 (+0000)
Subject:  - (djm) Makefile correctness fix from Mark D. Baushke <mdb@juniper.net>
X-Git-Tag: V_3_0_1_P1~32
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/3e4e3bc82ba696c87cc334aefc61e6ead3479e6e

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

diff --git a/CREDITS b/CREDITS
index 4b5cfdb7..c591e5c7 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
diff --git a/ChangeLog b/ChangeLog
index 22b5aabd..687c98b8 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.
diff --git a/Makefile.in b/Makefile.in
index d1234c56..d20bfca5 100644
--- 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)