summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in3
-rw-r--r--scard/Makefile.in3
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f5e6dab35..800b1eb0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@
25 - djm@cvs.openbsd.org 2006/10/22 02:25:50 25 - djm@cvs.openbsd.org 2006/10/22 02:25:50
26 [sftp-client.c] 26 [sftp-client.c]
27 cancel progress meter when upload write fails; ok deraadt@ 27 cancel progress meter when upload write fails; ok deraadt@
28 - (tim) [Makefile.in scard/Makefile.in] Add datarootdir= lines to keep
29 autoconf 2.60 from complaining.
28 30
2920061018 3120061018
30 - (dtucker) OpenBSD CVS Sync 32 - (dtucker) OpenBSD CVS Sync
@@ -2566,4 +2568,4 @@
2566 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2568 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2567 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2569 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2568 2570
2569$Id: ChangeLog,v 1.4578 2006/10/23 17:03:02 djm Exp $ 2571$Id: ChangeLog,v 1.4579 2006/10/23 21:44:47 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index 71f3623f1..fb6426b27 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.282 2006/09/12 11:54:10 djm Exp $ 1# $Id: Makefile.in,v 1.283 2006/10/23 21:44:47 tim Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -11,6 +11,7 @@ bindir=@bindir@
11sbindir=@sbindir@ 11sbindir=@sbindir@
12libexecdir=@libexecdir@ 12libexecdir=@libexecdir@
13datadir=@datadir@ 13datadir=@datadir@
14datarootdir=@datarootdir@
14mandir=@mandir@ 15mandir=@mandir@
15mansubdir=@mansubdir@ 16mansubdir=@mansubdir@
16sysconfdir=@sysconfdir@ 17sysconfdir=@sysconfdir@
diff --git a/scard/Makefile.in b/scard/Makefile.in
index ab4e22043..8519e208b 100644
--- a/scard/Makefile.in
+++ b/scard/Makefile.in
@@ -1,7 +1,8 @@
1# $Id: Makefile.in,v 1.4 2002/04/26 01:25:41 djm Exp $ 1# $Id: Makefile.in,v 1.5 2006/10/23 21:44:47 tim Exp $
2 2
3prefix=@prefix@ 3prefix=@prefix@
4datadir=@datadir@ 4datadir=@datadir@
5datarootdir=@datarootdir@
5srcdir=@srcdir@ 6srcdir=@srcdir@
6top_srcdir=@top_srcdir@ 7top_srcdir=@top_srcdir@
7 8