From owner-freebsd-current  Fri Feb 25  2:24:59 2000
Delivered-To: freebsd-current@freebsd.org
Received: from zibbi.mikom.csir.co.za (zibbi.mikom.csir.co.za [146.64.24.58])
	by hub.freebsd.org (Postfix) with ESMTP
	id DDBA337BB58; Fri, 25 Feb 2000 02:24:36 -0800 (PST)
	(envelope-from jhay@zibbi.mikom.csir.co.za)
Received: (from jhay@localhost)
	by zibbi.mikom.csir.co.za (8.9.3/8.9.3) id MAA96596;
	Fri, 25 Feb 2000 12:24:22 +0200 (SAT)
	(envelope-from jhay)
From: John Hay <jhay@mikom.csir.co.za>
Message-Id: <200002251024.MAA96596@zibbi.mikom.csir.co.za>
Subject: etc/Makefile patch
To: peter@freebsd.org, current@freebsd.org
Date: Fri, 25 Feb 2000 12:24:22 +0200 (SAT)
X-Mailer: ELM [version 2.4ME+ PL54 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

I found a missing / in the .if that protects the addition of the ssh
config files. The result is that they will never be installed. With
this patch mergemaster was able to install them.

John
-- 
John Hay -- John.Hay@mikom.csir.co.za


Index: etc/Makefile
===================================================================
RCS file: /home/ncvs/src/etc/Makefile,v
retrieving revision 1.215
diff -u -r1.215 Makefile
--- etc/Makefile	2000/02/25 05:16:44	1.215
+++ etc/Makefile	2000/02/25 09:08:51
@@ -20,7 +20,7 @@
 	${.CURDIR}/../usr.bin/mail/misc/mail.rc \
 	${.CURDIR}/../usr.bin/locate/locate/locate.rc
 
-.if exists(${.CURDIR}../crypto) && !defined(NO_OPENSSH)
+.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH)
 BIN1+=	${.CURDIR}/../crypto/openssh/ssh_config \
 	${.CURDIR}/../crypto/openssh/sshd_config
 .endif


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message