From a19cf47b0fa5cd16c1e471792109ce06023c9757 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 29 Nov 2000 13:28:50 +1100 Subject: [PATCH] - (djm) Patch from Pekka Savola to include a few more manpage paths in fixpaths calls - (djm) Also add xauth path at Pekka's suggestion. --- ChangeLog | 3 +++ Makefile.in | 15 ++++++++++++++- configure.in | 7 ++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f72d78985..69698457e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,9 @@ [ssh-keygen.c ssh.h] print keytype when generating a key. reasonable defaults for RSA1/RSA/DSA keys. + - (djm) Patch from Pekka Savola to include a few + more manpage paths in fixpaths calls + - (djm) Also add xauth path at Pekka's suggestion. 20001125 - (djm) Give up privs when reading seed file diff --git a/Makefile.in b/Makefile.in index 6588b1b99..3e7d7a89b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,6 +27,7 @@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ PERL=@PERL@ ENT=@ENT@ +XAUTH_PATH=@XAUTH_PATH@ LDFLAGS=-L. @LDFLAGS@ EXEEXT=@EXEEXT@ SSH_MODE= @SSHMODE@ @@ -49,7 +50,19 @@ MANPAGES = @MANTYPE@ CONFIGFILES=sshd_config ssh_config primes -PATHSUBS = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts -D/etc/sshd_config=$(sysconfdir)/sshd_config -D/usr/libexec=$(libexecdir) -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key -D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key -D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key -D/var/run/sshd.pid=$(piddir)/sshd.pid -D/etc/primes=$(sysconfdir)/primes +PATHSUBS = \ + -D/etc/ssh_config=$(sysconfdir)/ssh_config \ + -D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts \ + -D/etc/sshd_config=$(sysconfdir)/sshd_config \ + -D/usr/libexec=$(libexecdir) \ + -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv \ + -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key \ + -D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \ + -D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \ + -D/var/run/sshd.pid=$(piddir)/sshd.pid \ + -D/etc/primes=$(sysconfdir)/primes \ + -D/etc/sshrc=$(sysconfdir)/sshrc \ + -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS) diff --git a/configure.in b/configure.in index 01c541013..50e9d47ec 100644 --- a/configure.in +++ b/configure.in @@ -936,8 +936,13 @@ AC_ARG_WITH(xauth, ] ) -if test ! -z "$xauth_path" ; then +if test -z "$xauth_path" ; then + XAUTH_PATH="undefined" + AC_SUBST(XAUTH_PATH) +else AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path") + XAUTH_PATH=$xauth_path + AC_SUBST(XAUTH_PATH) fi if test ! -z "$rsh_path" ; then AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path")