diff options
| author | Damien Miller <djm@mindrot.org> | 2009-08-28 10:47:38 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2009-08-28 10:47:38 +1000 |
| commit | 7d4a2685f78440f09d25bf3fc7236a5f99af208a (patch) | |
| tree | 84ea09e83a9180dbf70f1551fbefc3b5468bf617 | |
| parent | 0e26551f7fa8371ef067dec63ff46918bf87ad8d (diff) | |
- (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables
in argv, so pass them in the environment; ok dtucker@
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Makefile.in | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -6,6 +6,8 @@ bz#1408; ok dtucker@ - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when attempting atomic rename(); ok dtucker@ + - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables + in argv, so pass them in the environment; ok dtucker@ 20090820 - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not diff --git a/Makefile.in b/Makefile.in index 75eb06d6..c5ecd5b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.299 2009/06/21 08:53:53 dtucker Exp $ +# $Id: Makefile.in,v 1.300 2009/08/28 00:47:38 djm Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -242,7 +242,7 @@ check-config: -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config scard-install: - (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install) + (cd scard && env DESTDIR=$(DESTDIR) $(MAKE) DESTDIR=$(DESTDIR) install) install-files: scard-install $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) |