summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2001-10-26 17:33:18 -0700
committerTim Rice <tim@multitalents.net>2001-10-26 17:33:18 -0700
commitafefd16b6e7078e5db300424a67c0d7650ed92dc (patch)
tree9f3c4b34b955717274a1d572b2590aa26d1d3830
parent9197c59493b895972a3dc4026461c019e48d29dc (diff)
Fix install: when building outside of source
tree and using --src=/full_path/to/openssh Patch by Mark D. Baushke <mdb@juniper.net>
-rw-r--r--ChangeLog5
-rw-r--r--scard/Makefile.in4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 788571d9a..eed1c3bca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
120011026 120011026
2 - (bal) Set the correct current time in login_utmp_only(). Patch by 2 - (bal) Set the correct current time in login_utmp_only(). Patch by
3 Wayne Davison <wayned@users.sourceforge.net> 3 Wayne Davison <wayned@users.sourceforge.net>
4 - (tim) [scard/Makefile.in] Fix install: when building outside of source
5 tree and using --src=/full_path/to/openssh
6 Patch by Mark D. Baushke <mdb@juniper.net>
4 7
520011025 820011025
6 - (bal) Use VDISABLE if _POSIX_VDISABLE is set in readpassphrase.c. Patch 9 - (bal) Use VDISABLE if _POSIX_VDISABLE is set in readpassphrase.c. Patch
@@ -6767,4 +6770,4 @@
6767 - Wrote replacements for strlcpy and mkdtemp 6770 - Wrote replacements for strlcpy and mkdtemp
6768 - Released 1.0pre1 6771 - Released 1.0pre1
6769 6772
6770$Id: ChangeLog,v 1.1619 2001/10/26 15:56:55 mouring Exp $ 6773$Id: ChangeLog,v 1.1620 2001/10/27 00:33:18 tim Exp $
diff --git a/scard/Makefile.in b/scard/Makefile.in
index 7b054a80e..4b204050c 100644
--- a/scard/Makefile.in
+++ b/scard/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.2 2001/09/20 18:39:37 tim Exp $ 1# $Id: Makefile.in,v 1.3 2001/10/27 00:33:19 tim Exp $
2 2
3prefix=@prefix@ 3prefix=@prefix@
4datadir=@datadir@ 4datadir=@datadir@
@@ -22,6 +22,6 @@ distprep: Ssh.bin
22distclean: clean 22distclean: clean
23 rm -f Makefile *~ 23 rm -f Makefile *~
24 24
25install: Ssh.bin 25install: $(srcdir)/Ssh.bin
26 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir) 26 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
27 $(INSTALL) -m 0644 $(srcdir)/Ssh.bin $(DESTDIR)$(datadir)/Ssh.bin 27 $(INSTALL) -m 0644 $(srcdir)/Ssh.bin $(DESTDIR)$(datadir)/Ssh.bin