Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Jan 2014 15:19:53 +0000 (UTC)
From:      Bernhard Froehlich <decke@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339783 - head/devel/kBuild
Message-ID:  <201401151519.s0FFJrBq088989@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <dlorch@gmail.com>

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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401151519.s0FFJrBq088989>