diff options
author | Damien Miller <djm@mindrot.org> | 2001-11-12 10:34:22 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-11-12 10:34:22 +1100 |
commit | f41d618fec126ae0d8083e2cc4c2074fbf023759 (patch) | |
tree | 5a79a7dd5fb5f3fed93eec9f07f823558c7b8f2a | |
parent | de77b464c6214139ff5ef65521621d9245472c68 (diff) |
- (djm) Makefile correctness fix from Mark D. Baushke <mdb@juniper.net>
-rw-r--r-- | CREDITS | 3 | ||||
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.in | 18 |
3 files changed, 15 insertions, 11 deletions
@@ -54,6 +54,7 @@ Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes | |||
54 | Larry Jones <larry.jones@sdrc.com> - Bugfixes | 54 | Larry Jones <larry.jones@sdrc.com> - Bugfixes |
55 | Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes | 55 | Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes |
56 | Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches | 56 | Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches |
57 | Mark D. Baushke <mdb@juniper.net> - bug fixes | ||
57 | Martin Johansson <fatbob@acc.umu.se> - Linux fixes | 58 | Martin Johansson <fatbob@acc.umu.se> - Linux fixes |
58 | Mark D. Roth <roth+openssh@feep.net> - Features, bug fixes | 59 | Mark D. Roth <roth+openssh@feep.net> - Features, bug fixes |
59 | Mark Miller <markm@swoon.net> - Bugfixes | 60 | Mark Miller <markm@swoon.net> - Bugfixes |
@@ -88,5 +89,5 @@ Apologies to anyone I have missed. | |||
88 | 89 | ||
89 | Damien Miller <djm@mindrot.org> | 90 | Damien Miller <djm@mindrot.org> |
90 | 91 | ||
91 | $Id: CREDITS,v 1.62 2001/04/16 00:41:46 djm Exp $ | 92 | $Id: CREDITS,v 1.63 2001/11/11 23:34:22 djm Exp $ |
92 | 93 | ||
@@ -1,3 +1,6 @@ | |||
1 | 20011112 | ||
2 | - (djm) Makefile correctness fix from Mark D. Baushke <mdb@juniper.net> | ||
3 | |||
1 | 20011109 | 4 | 20011109 |
2 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) | 5 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) |
3 | if permit_empty_passwd == 0 so null password check cannot be bypassed. | 6 | if permit_empty_passwd == 0 so null password check cannot be bypassed. |
@@ -6806,4 +6809,4 @@ | |||
6806 | - Wrote replacements for strlcpy and mkdtemp | 6809 | - Wrote replacements for strlcpy and mkdtemp |
6807 | - Released 1.0pre1 | 6810 | - Released 1.0pre1 |
6808 | 6811 | ||
6809 | $Id: ChangeLog,v 1.1632 2001/11/09 20:22:16 stevesk Exp $ | 6812 | $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 @@ | |||
1 | # $Id: Makefile.in,v 1.189 2001/10/22 00:53:59 tim Exp $ | 1 | # $Id: Makefile.in,v 1.190 2001/11/11 23:34:23 djm Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -87,7 +87,7 @@ $(SSHDOBJS): config.h | |||
87 | 87 | ||
88 | LIBCOMPAT=openbsd-compat/libopenbsd-compat.a | 88 | LIBCOMPAT=openbsd-compat/libopenbsd-compat.a |
89 | $(LIBCOMPAT): always | 89 | $(LIBCOMPAT): always |
90 | (cd openbsd-compat; $(MAKE)) | 90 | (cd openbsd-compat && $(MAKE)) |
91 | always: | 91 | always: |
92 | 92 | ||
93 | libssh.a: $(LIBSSH_OBJS) | 93 | libssh.a: $(LIBSSH_OBJS) |
@@ -144,23 +144,23 @@ $(CONFIGFILES): $(CONFIGFILES_IN) | |||
144 | clean: | 144 | clean: |
145 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 145 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
146 | rm -f *.out core | 146 | rm -f *.out core |
147 | (cd openbsd-compat; $(MAKE) clean) | 147 | (cd openbsd-compat && $(MAKE) clean) |
148 | 148 | ||
149 | distclean: | 149 | distclean: |
150 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 150 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
151 | rm -f *.out core | 151 | rm -f *.out core |
152 | rm -f Makefile config.h config.status ssh_prng_cmds *~ | 152 | rm -f Makefile config.h config.status ssh_prng_cmds *~ |
153 | rm -rf autom4te.cache | 153 | rm -rf autom4te.cache |
154 | (cd openbsd-compat; $(MAKE) distclean) | 154 | (cd openbsd-compat && $(MAKE) distclean) |
155 | (cd scard; $(MAKE) distclean) | 155 | (cd scard && $(MAKE) distclean) |
156 | 156 | ||
157 | veryclean: | 157 | veryclean: |
158 | rm -f configure config.h.in *.0 | 158 | rm -f configure config.h.in *.0 |
159 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 159 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
160 | rm -f *.out core | 160 | rm -f *.out core |
161 | rm -f Makefile config.h config.status ssh_prng_cmds *~ | 161 | rm -f Makefile config.h config.status ssh_prng_cmds *~ |
162 | (cd openbsd-compat; $(MAKE) distclean) | 162 | (cd openbsd-compat && $(MAKE) distclean) |
163 | (cd scard; $(MAKE) distclean) | 163 | (cd scard && $(MAKE) distclean) |
164 | 164 | ||
165 | mrproper: distclean | 165 | mrproper: distclean |
166 | 166 | ||
@@ -174,13 +174,13 @@ catman-do: | |||
174 | 174 | ||
175 | distprep: catman-do | 175 | distprep: catman-do |
176 | autoreconf | 176 | autoreconf |
177 | (cd scard ; $(MAKE) -f Makefile.in distprep) | 177 | (cd scard && $(MAKE) -f Makefile.in distprep) |
178 | 178 | ||
179 | install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key | 179 | install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key |
180 | install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files | 180 | install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files |
181 | 181 | ||
182 | scard-install: | 182 | scard-install: |
183 | (cd scard; $(MAKE) DESTDIR=$(DESTDIR) install) | 183 | (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install) |
184 | 184 | ||
185 | install-files: scard-install | 185 | install-files: scard-install |
186 | $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) | 186 | $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) |