- (djm) Add --with-privsep-path configure option

[openssh.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e3f2506efc33ec04f74d622e4f0b8241ae2af5c8..e32381e4340e556799a1d957079a0624b5ab2022 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,6 +3,8 @@
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
 
+AUTORECONF=autoreconf
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
@@ -21,12 +23,14 @@ VPATH=@srcdir@
 SSH_PROGRAM=@bindir@/ssh
 ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
 SFTP_SERVER=$(libexecdir)/sftp-server
+PRIVSEP_PATH=@PRIVSEP_PATH@
 
 PATHS= -DSSHDIR=\"$(sysconfdir)\" \
        -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
        -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
        -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
        -D_PATH_SSH_PIDDIR=\"$(piddir)\" \
+       -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\"
        -DSSH_RAND_HELPER=\"$(libexecdir)/ssh-rand-helper\"
 
 CC=@CC@
@@ -80,6 +84,7 @@ PATHSUBS      = \
        -D/etc/ssh/moduli=$(sysconfdir)/moduli \
        -D/etc/ssh/sshrc=$(sysconfdir)/sshrc \
        -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \
+       -D/var/empty=$(PRIVSEP_PATH) \
        -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@
 
 FIXPATHSCMD    = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
@@ -184,7 +189,7 @@ catman-do:
        done
 
 distprep: catman-do
-       autoreconf
+       $(AUTORECONF)
        (cd scard && $(MAKE) -f Makefile.in distprep)
 
 install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key