From owner-svn-src-stable-11@freebsd.org  Mon Mar 26 23:23:12 2018
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6124FF519AE;
 Mon, 26 Mar 2018 23:23:12 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 131277C7D6;
 Mon, 26 Mar 2018 23:23:12 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0DFEF13AF5;
 Mon, 26 Mar 2018 23:23:12 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2QNNBOO008583;
 Mon, 26 Mar 2018 23:23:11 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2QNNBlJ008582;
 Mon, 26 Mar 2018 23:23:11 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201803262323.w2QNNBlJ008582@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 26 Mar 2018 23:23:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r331601 - stable/11/include
X-SVN-Group: stable-11
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: stable/11/include
X-SVN-Commit-Revision: 331601
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Mar 2018 23:23:12 -0000

Author: hselasky
Date: Mon Mar 26 23:23:11 2018
New Revision: 331601
URL: https://svnweb.freebsd.org/changeset/base/331601

Log:
  Fix buildworld after r331586 by adapting the installation of
  dev/mlx5/mlx5io.h to the build system in FreeBSD 11-stable.
  
  This is a direct commit.
  
  Found by:	jhb@
  Pointy hat:	hselasky@
  Sponsored by:   Mellanox Technologies

Modified:
  stable/11/include/Makefile

Modified: stable/11/include/Makefile
==============================================================================
--- stable/11/include/Makefile	Mon Mar 26 23:20:37 2018	(r331600)
+++ stable/11/include/Makefile	Mon Mar 26 23:23:11 2018	(r331601)
@@ -254,9 +254,9 @@ copies: .PHONY .META
 	    ${DESTDIR}${INCLUDEDIR}/sys
 .endif
 .if ${MK_MLX5TOOL} != "no"
-	cd ${SRCTOP}/sys/dev/mlx5; \
+	cd ${.CURDIR}/../sys/dev/mlx5; \
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 mlx5io.h \
-	    ${SDESTDIR}${INCLUDEDIR}/dev/mlx5
+	    ${DESTDIR}${INCLUDEDIR}/dev/mlx5
 .endif
 
 symlinks: .PHONY .META
@@ -389,7 +389,7 @@ symlinks: .PHONY .META
 	done
 .if ${MK_MLX5TOOL} != "no"
 	${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/mlx5/mlx5io.h \
-	    ${SDESTDIR}${INCLUDEDIR}/dev/mlx5
+	    ${DESTDIR}${INCLUDEDIR}/dev/mlx5
 .endif
 
 .include <bsd.prog.mk>