Author: pierre
Date: Mon Feb 5 02:30:01 2018
New Revision: 4040
Log:
Only output DESTDIR when the command is "ninja install"
Modified:
jhalfs/trunk/LFS/lfs.xsl
Modified: jhalfs/trunk/LFS/lfs.xsl
==============================================================================
--- jhalfs/trunk/LFS/lfs.xsl Mon Feb 5 01:54:15 2018 (r4039)
+++ jhalfs/trunk/LFS/lfs.xsl Mon Feb 5 02:30:01 2018 (r4040)
@@ -845,21 +845,22 @@
</xsl:otherwise>
</xsl:choose>
</xsl:when>
- <xsl:when test="contains($outputstring,'ninja ')">
+ <xsl:when test="contains($outputstring,'ninja install')">
<xsl:choose>
- <xsl:when test="not(starts-with($outputstring,'ninja'))">
+ <xsl:when test="not(starts-with($outputstring,'ninja install'))">
<xsl:call-template name="outputpkgdest">
<xsl:with-param name="outputstring"
-
select="substring-before($outputstring,'ninja')"/>
+ select="substring-before($outputstring,'ninja
install')"/>
</xsl:call-template>
<xsl:call-template name="outputpkgdest">
<xsl:with-param
name="outputstring"
select="substring-after($outputstring,
-
substring-before($outputstring,'ninja'))"/>
+ substring-before($outputstring,'ninja
install'))"/>
</xsl:call-template>
</xsl:when>
- <xsl:otherwise> <!-- ninja is the first word -->
+ <xsl:otherwise> <!-- "ninja" is the first word and is followed by
+ "install"-->
<xsl:text>DESTDIR=$PKG_DEST ninja</xsl:text>
<xsl:call-template name="outputpkgdest">
<xsl:with-param
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
