From owner-svn-src-all@freebsd.org  Tue Oct  6 07:28:55 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAFF29B92F7;
 Tue,  6 Oct 2015 07:28:55 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BC12D251;
 Tue,  6 Oct 2015 07:28:55 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t967StdM038108;
 Tue, 6 Oct 2015 07:28:55 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t967St0A038106;
 Tue, 6 Oct 2015 07:28:55 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201510060728.t967St0A038106@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 6 Oct 2015 07:28:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288913 - in head: lib/libxo usr.bin/xo
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2015 07:28:55 -0000

Author: ngie
Date: Tue Oct  6 07:28:54 2015
New Revision: 288913
URL: https://svnweb.freebsd.org/changeset/base/288913

Log:
  Use LIBXOSRC instead of LIBXO when defining the path to contrib/libxo
  
  The latter is already defined in bsd.libnames.mk, so avoid the conflict
  in case someone copy-pastes make variables
  
  While here, switch path to the top of the source tree with SRCTOP

Modified:
  head/lib/libxo/Makefile
  head/usr.bin/xo/Makefile

Modified: head/lib/libxo/Makefile
==============================================================================
--- head/lib/libxo/Makefile	Tue Oct  6 05:49:00 2015	(r288912)
+++ head/lib/libxo/Makefile	Tue Oct  6 07:28:54 2015	(r288913)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-LIBXO=	${.CURDIR:H:H}/contrib/libxo
+LIBXOSRC=	${SRCTOP}/contrib/libxo
 
-.PATH:	${LIBXO}/libxo
+.PATH:	${LIBXOSRC}/libxo
 
 LIB=	xo
 SHLIB_MAJOR=0
@@ -11,7 +11,7 @@ SHLIBDIR?=      /lib
 
 SRCS=	libxo.c xo_encoder.c xo_syslog.c
 
-CFLAGS+=-I${LIBXO}/libxo
+CFLAGS+=-I${LIBXOSRC}/libxo
 CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
 
 INCS=	xo.h xo_encoder.h

Modified: head/usr.bin/xo/Makefile
==============================================================================
--- head/usr.bin/xo/Makefile	Tue Oct  6 05:49:00 2015	(r288912)
+++ head/usr.bin/xo/Makefile	Tue Oct  6 07:28:54 2015	(r288913)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-LIBXO=	${.CURDIR:H:H}/contrib/libxo
+LIBXOSRC=	${SRCTOP}/contrib/libxo
 
-.PATH:	${LIBXO}/xo
+.PATH:	${LIBXOSRC}/xo
 
 PROG=	xo
 MAN=	xo.1
 
 # XXX For xoversion.h
-CFLAGS+=-I${LIBXO}/libxo
+CFLAGS+=-I${LIBXOSRC}/libxo
 
 LIBADD=	xo util