Skip to content

Commit

Permalink
- (djm) Makefile correctness fix from Mark D. Baushke <[email protected]>
Browse files Browse the repository at this point in the history
  • Loading branch information
djmdjm committed Nov 11, 2001
1 parent de77b46 commit f41d618
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
3 changes: 2 additions & 1 deletion CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Kiyokazu SUTO <[email protected]> - Bugfixes
Larry Jones <[email protected]> - Bugfixes
Lutz Jaenicke <[email protected]> - Bugfixes
Marc G. Fournier <[email protected]> - Solaris patches
Mark D. Baushke <[email protected]> - bug fixes
Martin Johansson <[email protected]> - Linux fixes
Mark D. Roth <[email protected]> - Features, bug fixes
Mark Miller <[email protected]> - Bugfixes
Expand Down Expand Up @@ -88,5 +89,5 @@ Apologies to anyone I have missed.

Damien Miller <[email protected]>

$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 $

5 changes: 4 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
20011112
- (djm) Makefile correctness fix from Mark D. Baushke <[email protected]>

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.
Expand Down Expand Up @@ -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 $
18 changes: 9 additions & 9 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -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@
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand All @@ -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)
Expand Down

0 comments on commit f41d618

Please sign in to comment.