zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add DESTDIR instructions when the command is "ninja install" (in LFS/lfs.xsl)

Browse source
This commit is contained in:
Pierre Labastie 2018-02-05 09:54:15 +00:00
parent bcbecc53f9
commit 4696ddd406
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
LFS/lfs.xsl
View file

@ -845,7 +845,31 @@ DNS=</xsl:text>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:otherwise> <!-- no make in this string --> <xsl:when test="contains($outputstring,'ninja ')">
<xsl:choose>
<xsl:when test="not(starts-with($outputstring,'ninja'))">
<xsl:call-template name="outputpkgdest">
<xsl:with-param name="outputstring"
select="substring-before($outputstring,'ninja')"/>
</xsl:call-template>
<xsl:call-template name="outputpkgdest">
<xsl:with-param
name="outputstring"
select="substring-after($outputstring,
substring-before($outputstring,'ninja'))"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise> <!-- ninja is the first word -->
<xsl:text>DESTDIR=$PKG_DEST ninja</xsl:text>
<xsl:call-template name="outputpkgdest">
<xsl:with-param
name="outputstring"
select="substring-after($outputstring,'ninja')"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise> <!-- no make nor ninja in this string -->
<xsl:choose> <xsl:choose>
<xsl:when test="contains($outputstring,'&gt;/') and <xsl:when test="contains($outputstring,'&gt;/') and
not(contains(substring-before($outputstring,'&gt;/'),' /'))"> not(contains(substring-before($outputstring,'&gt;/'),' /'))">