From owner-svn-ports-all@FreeBSD.ORG  Fri Apr 11 21:45:56 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 40B58E08;
 Fri, 11 Apr 2014 21:45:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 2D93E1213;
 Fri, 11 Apr 2014 21:45:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3BLjuPF063864;
 Fri, 11 Apr 2014 21:45:56 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3BLjuTv063863;
 Fri, 11 Apr 2014 21:45:56 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201404112145.s3BLjuTv063863@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 11 Apr 2014 21:45:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351051 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Apr 2014 21:45:56 -0000

Author: brooks
Date: Fri Apr 11 21:45:55 2014
New Revision: 351051
URL: http://svnweb.freebsd.org/changeset/ports/351051
QAT: https://qat.redports.org/buildarchive/r351051/

Log:
  Allow an alternative install prefix to be specified with
  CMAKE_INSTALL_PREFIX.  This is similar to GNU_CONFIGURE_PREFIX and is
  useful for ports that would conflict if installed directly in PREFIX.

Modified:
  head/Mk/Uses/cmake.mk

Modified: head/Mk/Uses/cmake.mk
==============================================================================
--- head/Mk/Uses/cmake.mk	Fri Apr 11 21:43:45 2014	(r351050)
+++ head/Mk/Uses/cmake.mk	Fri Apr 11 21:45:55 2014	(r351051)
@@ -83,11 +83,13 @@ CMAKE_ARGS+=		-DCMAKE_C_COMPILER:STRING=
 			-DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_MODULE_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_SHARED_LINKER_FLAGS:STRING="${LDFLAGS}" \
-			-DCMAKE_INSTALL_PREFIX:PATH="${PREFIX}" \
+			-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
 			-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
 			-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \
 			-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES
 
+CMAKE_INSTALL_PREFIX?=	${PREFIX}
+
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 CMAKE_VERBOSE=		yes
 CMAKE_NOCOLOR=		yes