summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-05-13 13:15:42 +1000
committerDamien Miller <djm@mindrot.org>2002-05-13 13:15:42 +1000
commitf58c672f0ed61507f0d4b56e7c31478bd580b809 (patch)
treecbd1868a16b5b9ad6171c99d9e47ac47d5d0cd70 /Makefile.in
parent5ad9fd982037e512355cfd5fe060a554934be243 (diff)
- (djm) Add --with-privsep-path configure option
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 6af2e3a87..7f7c8d88a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,10 @@
1# $Id: Makefile.in,v 1.206 2002/05/09 14:05:59 tim Exp $ 1# $Id: Makefile.in,v 1.207 2002/05/13 03:15:43 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@
5 5
6AUTORECONF=autoreconf
7
6prefix=@prefix@ 8prefix=@prefix@
7exec_prefix=@exec_prefix@ 9exec_prefix=@exec_prefix@
8bindir=@bindir@ 10bindir=@bindir@
@@ -21,12 +23,14 @@ VPATH=@srcdir@
21SSH_PROGRAM=@bindir@/ssh 23SSH_PROGRAM=@bindir@/ssh
22ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass 24ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
23SFTP_SERVER=$(libexecdir)/sftp-server 25SFTP_SERVER=$(libexecdir)/sftp-server
26PRIVSEP_PATH=@PRIVSEP_PATH@
24 27
25PATHS= -DSSHDIR=\"$(sysconfdir)\" \ 28PATHS= -DSSHDIR=\"$(sysconfdir)\" \
26 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ 29 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
27 -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ 30 -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
28 -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ 31 -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
29 -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ 32 -D_PATH_SSH_PIDDIR=\"$(piddir)\" \
33 -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\"
30 -DSSH_RAND_HELPER=\"$(libexecdir)/ssh-rand-helper\" 34 -DSSH_RAND_HELPER=\"$(libexecdir)/ssh-rand-helper\"
31 35
32CC=@CC@ 36CC=@CC@
@@ -80,6 +84,7 @@ PATHSUBS = \
80 -D/etc/ssh/moduli=$(sysconfdir)/moduli \ 84 -D/etc/ssh/moduli=$(sysconfdir)/moduli \
81 -D/etc/ssh/sshrc=$(sysconfdir)/sshrc \ 85 -D/etc/ssh/sshrc=$(sysconfdir)/sshrc \
82 -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \ 86 -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \
87 -D/var/empty=$(PRIVSEP_PATH) \
83 -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@ 88 -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@
84 89
85FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS) 90FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
@@ -184,7 +189,7 @@ catman-do:
184 done 189 done
185 190
186distprep: catman-do 191distprep: catman-do
187 autoreconf 192 $(AUTORECONF)
188 (cd scard && $(MAKE) -f Makefile.in distprep) 193 (cd scard && $(MAKE) -f Makefile.in distprep)
189 194
190install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key 195install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key