From owner-svn-ports-all@FreeBSD.ORG Wed Jan 15 15:19:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5946CBD; Wed, 15 Jan 2014 15:19:53 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4586B1D6E; Wed, 15 Jan 2014 15:19:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FFJrnk088990; Wed, 15 Jan 2014 15:19:53 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FFJrBq088989; Wed, 15 Jan 2014 15:19:53 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201401151519.s0FFJrBq088989@svn.freebsd.org> From: Bernhard Froehlich Date: Wed, 15 Jan 2014 15:19:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339783 - head/devel/kBuild 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 15:19:53 -0000 Author: decke Date: Wed Jan 15 15:19:52 2014 New Revision: 339783 URL: http://svnweb.freebsd.org/changeset/ports/339783 QAT: https://qat.redports.org/buildarchive/r339783/ Log: - Replace hardcoded freebsd strings with KBUILD_TARGET in do-install PR: ports/184296 Submitted by: Daniel Lorch Modified: head/devel/kBuild/Makefile Modified: head/devel/kBuild/Makefile ============================================================================== --- head/devel/kBuild/Makefile Wed Jan 15 15:16:24 2014 (r339782) +++ head/devel/kBuild/Makefile Wed Jan 15 15:19:52 2014 (r339783) @@ -29,6 +29,7 @@ KBUILD_ENV= ACLOCAL=${ACLOCAL} \ AUTORECONF=${AUTORECONF} \ AUTOPOINT=true USE_GCC= any +KBUILD_TARGET= ${OPSYS:tl} KBUILD_BINS= kDepIDB kDepPre kObjCache kmk kmk_append kmk_ash kmk_cat \ kmk_chmod kmk_cmp kmk_cp kmk_echo kmk_expr kmk_gmake \ @@ -65,14 +66,14 @@ do-build: do-install: .for bin in ${KBUILD_BINS} - ${INSTALL_PROGRAM} ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release/stage${PREFIX}/bin/${bin} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/bin/${bin} ${PREFIX}/bin .endfor ${MKDIR} ${DATADIR} - (cd ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${DATADIR}) + (cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${DATADIR}) .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${DOCSDIR} .endfor .endif