summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index be206a44a..90da28c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
6 bz#1408; ok dtucker@ 6 bz#1408; ok dtucker@
7 - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when 7 - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when
8 attempting atomic rename(); ok dtucker@ 8 attempting atomic rename(); ok dtucker@
9 - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables
10 in argv, so pass them in the environment; ok dtucker@
9 11
1020090820 1220090820
11 - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not 13 - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
diff --git a/Makefile.in b/Makefile.in
index 75eb06d6f..c5ecd5b39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.299 2009/06/21 08:53:53 dtucker Exp $ 1# $Id: Makefile.in,v 1.300 2009/08/28 00:47:38 djm 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@
@@ -242,7 +242,7 @@ check-config:
242 -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config 242 -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
243 243
244scard-install: 244scard-install:
245 (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install) 245 (cd scard && env DESTDIR=$(DESTDIR) $(MAKE) DESTDIR=$(DESTDIR) install)
246 246
247install-files: scard-install 247install-files: scard-install
248 $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) 248 $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)