From 1ba81bee04e9a87d2a134a2a72b451fec77de49c Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Wed, 24 Jul 2002 04:33:13 +0000 Subject: [PATCH] Fix an build problem with make install on STABLE --- security/openssh/files/patch-Makefile.inc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/security/openssh/files/patch-Makefile.inc b/security/openssh/files/patch-Makefile.inc index ad173cc96722..825c12debad7 100644 --- a/security/openssh/files/patch-Makefile.inc +++ b/security/openssh/files/patch-Makefile.inc @@ -1,20 +1,21 @@ --- Makefile.inc.orig Wed Mar 6 01:23:27 2002 -+++ Makefile.inc Mon Jun 24 23:43:18 2002 -@@ -17,10 +17,16 @@ ++++ Makefile.inc Wed Jul 24 05:42:52 2002 +@@ -15,12 +15,16 @@ + #CFLAGS+= -DSMARTCARD + #LDADD+= -lsectok - .include - --.if exists(${.CURDIR}/../lib/${__objdir}) --LDADD+= -L${.CURDIR}/../lib/${__objdir} -lssh --DPADD+= ${.CURDIR}/../lib/${__objdir}/libssh.a --.else +-.include +AFS?= no +KERBEROS?= no +KERBEROS5?= no +PAM?= no +SKEY?= no +TCP_WRAPPERS?= yes -+ + +-.if exists(${.CURDIR}/../lib/${__objdir}) +-LDADD+= -L${.CURDIR}/../lib/${__objdir} -lssh +-DPADD+= ${.CURDIR}/../lib/${__objdir}/libssh.a +-.else +CFLAGS+= -I${OPENSSLINC} ${INET6FLAGS} + +.if !defined(IGNORE_LIBSSH)