- (bal) Makfile day... Cleaned up multiple mantype support (Patch by
Mark D. Roth <roth+openssh@feep.net>), and fixed PIDDIR support.
This commit is contained in:
Ben Lindstrom
parent
e2e66a27a7
commit
bc70992058
|
|
@ -10,6 +10,8 @@
|
|||
debug->debug3
|
||||
- (bal) renabled 'catman-do:' and fixed it. So now catman pages should
|
||||
be working again.
|
||||
- (bal) Makfile day... Cleaned up multiple mantype support (Patch by
|
||||
Mark D. Roth <roth+openssh@feep.net>), and fixed PIDDIR support.
|
||||
|
||||
20010417
|
||||
- (bal) Add perl5 check for HP/UX, Removed GNUness from Makefile.in
|
||||
|
|
@ -5157,4 +5159,4 @@
|
|||
- Wrote replacements for strlcpy and mkdtemp
|
||||
- Released 1.0pre1
|
||||
|
||||
$Id: ChangeLog,v 1.1138 2001/04/18 15:46:01 mouring Exp $
|
||||
$Id: ChangeLog,v 1.1139 2001/04/18 18:04:21 mouring Exp $
|
||||
|
|
|
|||
37
Makefile.in
37
Makefile.in
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile.in,v 1.171 2001/04/18 15:46:03 mouring Exp $
|
||||
# $Id: Makefile.in,v 1.172 2001/04/18 18:04:22 mouring Exp $
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
|
|
@ -6,6 +6,7 @@ bindir=@bindir@
|
|||
sbindir=@sbindir@
|
||||
libexecdir=@libexecdir@
|
||||
mandir=@mandir@
|
||||
mansubdir=@mansubdir@
|
||||
sysconfdir=@sysconfdir@
|
||||
piddir=@piddir@
|
||||
srcdir=@srcdir@
|
||||
|
|
@ -20,7 +21,8 @@ SFTP_SERVER=$(libexecdir)/sftp-server
|
|||
PATHS= -DETCDIR=\"$(sysconfdir)\" \
|
||||
-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
|
||||
-D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
|
||||
-D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\"
|
||||
-D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
|
||||
-D_PATH_SSH_PIDDIR=\"$(piddir)\"
|
||||
|
||||
CC=@CC@
|
||||
LD=@LD@
|
||||
|
|
@ -126,9 +128,9 @@ $(MANPAGES)::
|
|||
manpage=$@; \
|
||||
fi; \
|
||||
if test "$(MANTYPE)" = "man"; then \
|
||||
$(FIXPATHSCMD) $(srcdir)/$${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \
|
||||
$(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \
|
||||
else \
|
||||
$(FIXPATHSCMD) $(srcdir)/$${manpage} > $@.out; \
|
||||
$(FIXPATHSCMD) $${manpage} > $@.out; \
|
||||
fi
|
||||
|
||||
$(CONFIGFILES)::
|
||||
|
|
@ -165,6 +167,8 @@ install-files:
|
|||
$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
|
||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
|
||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
|
||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
|
||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
|
||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
|
||||
$(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh
|
||||
$(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
|
||||
|
|
@ -175,22 +179,15 @@ install-files:
|
|||
$(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd
|
||||
@NO_SFTP@$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp
|
||||
@NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(SFTP_SERVER)
|
||||
if test "$(MANTYPE)" = "doc"; then \
|
||||
mansubdir="man"; \
|
||||
else \
|
||||
mansubdir="$(MANTYPE)"; \
|
||||
fi; \
|
||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$${mansubdir}1; \
|
||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$${mansubdir}8; \
|
||||
$(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh.1; \
|
||||
$(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/scp.1; \
|
||||
$(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh-add.1; \
|
||||
$(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh-agent.1; \
|
||||
$(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh-keygen.1; \
|
||||
$(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/ssh-keyscan.1; \
|
||||
$(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$${mansubdir}8/sshd.8; \
|
||||
@NO_SFTP@$(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$${mansubdir}1/sftp.1; \
|
||||
@NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$${mansubdir}8/sftp-server.8;
|
||||
$(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
|
||||
$(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
|
||||
$(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
|
||||
$(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
|
||||
$(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
|
||||
$(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
|
||||
$(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
|
||||
@NO_SFTP@$(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
|
||||
@NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
|
||||
-rm -f $(DESTDIR)$(bindir)/slogin
|
||||
ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
|
||||
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
|
||||
|
|
|
|||
31
configure.in
31
configure.in
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: configure.in,v 1.277 2001/04/17 17:57:11 mouring Exp $
|
||||
# $Id: configure.in,v 1.278 2001/04/18 18:04:23 mouring Exp $
|
||||
|
||||
AC_INIT(ssh.c)
|
||||
|
||||
|
|
@ -70,11 +70,9 @@ case "$host" in
|
|||
AC_DEFINE(NO_X11_UNIX_SOCKETS)
|
||||
no_libsocket=1
|
||||
no_libnsl=1
|
||||
MANTYPE=doc
|
||||
;;
|
||||
*-*-dgux*)
|
||||
AC_DEFINE(IP_TOS_IS_BROKEN)
|
||||
MANTYPE=doc
|
||||
;;
|
||||
*-*-hpux10*)
|
||||
if test -z "$GCC"; then
|
||||
|
|
@ -124,7 +122,6 @@ case "$host" in
|
|||
AC_DEFINE(DONT_TRY_OTHER_AF)
|
||||
AC_DEFINE(PAM_TTY_KLUDGE)
|
||||
inet6_default_4in6=yes
|
||||
MANTYPE=doc
|
||||
;;
|
||||
mips-sony-bsd|mips-sony-newsos4)
|
||||
AC_DEFINE(HAVE_NEWS4)
|
||||
|
|
@ -132,15 +129,12 @@ mips-sony-bsd|mips-sony-newsos4)
|
|||
AC_CHECK_LIB(iberty, xatexit, AC_DEFINE(HAVE_XATEXIT),
|
||||
AC_MSG_ERROR([*** libiberty missing - please install first or check config.log ***])
|
||||
)
|
||||
MANTYPE=doc
|
||||
;;
|
||||
*-*-netbsd*)
|
||||
need_dash_r=1
|
||||
MANTYPE=doc
|
||||
;;
|
||||
*-*-freebsd*)
|
||||
check_for_libcrypt_later=1
|
||||
MANTYPE=doc
|
||||
;;
|
||||
*-next-*)
|
||||
conf_lastlog_location="/usr/adm/lastlog"
|
||||
|
|
@ -153,7 +147,6 @@ mips-sony-bsd|mips-sony-newsos4)
|
|||
AC_DEFINE(BROKEN_SAVED_UIDS)
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
CFLAGS="$CFLAGS"
|
||||
MANTYPE=doc
|
||||
;;
|
||||
*-*-solaris*)
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
|
|
@ -1416,13 +1409,25 @@ AC_ARG_WITH(catman,
|
|||
AC_MSG_ERROR(invalid man type: $withval)
|
||||
;;
|
||||
esac
|
||||
], [
|
||||
if test -z "$MANTYPE" ; then
|
||||
MANTYPE=man
|
||||
fi
|
||||
]
|
||||
)
|
||||
if test -z "$MANTYPE"; then
|
||||
AC_PATH_PROGS(NROFF, nroff awf, /bin/false, /usr/bin)
|
||||
if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
|
||||
MANTYPE=doc
|
||||
elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then
|
||||
MANTYPE=man
|
||||
else
|
||||
MANTYPE=cat
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(MANTYPE)
|
||||
if test "$MANTYPE" = "doc"; then
|
||||
mansubdir=man;
|
||||
else
|
||||
mansubdir=$MANTYPE;
|
||||
fi
|
||||
AC_SUBST(mansubdir)
|
||||
|
||||
# Check whether to enable MD5 passwords
|
||||
MD5_MSG="no"
|
||||
|
|
@ -1896,7 +1901,7 @@ B=`eval echo ${bindir}` ; B=`eval echo ${B}`
|
|||
C=`eval echo ${sbindir}` ; C=`eval echo ${C}`
|
||||
D=`eval echo ${sysconfdir}` ; D=`eval echo ${D}`
|
||||
E=`eval echo ${libexecdir}/ssh-askpass` ; E=`eval echo ${E}`
|
||||
F=`eval echo ${mandir}` ; F=`eval echo ${F}`
|
||||
F=`eval echo ${mandir}/${mansubdir}X` ; F=`eval echo ${F}`
|
||||
G=`eval echo ${piddir}` ; G=`eval echo ${G}`
|
||||
H=`eval echo ${user_path}` ; H=`eval echo ${H}`
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue