Changeset 4696ddd for LFS


Ignore:
Timestamp:
02/05/2018 09:54:15 AM (6 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
ablfs-more, legacy, trunk
Children:
1cb4c76
Parents:
bcbecc5
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • LFS/lfs.xsl

    rbcbecc5 r4696ddd  
    846846        </xsl:choose>
    847847      </xsl:when>
    848       <xsl:otherwise> <!-- no make in this string -->
     848      <xsl:when test="contains($outputstring,'ninja ')">
     849        <xsl:choose>
     850          <xsl:when test="not(starts-with($outputstring,'ninja'))">
     851            <xsl:call-template name="outputpkgdest">
     852              <xsl:with-param name="outputstring"
     853                              select="substring-before($outputstring,'ninja')"/>
     854            </xsl:call-template>
     855            <xsl:call-template name="outputpkgdest">
     856              <xsl:with-param
     857                 name="outputstring"
     858                 select="substring-after($outputstring,
     859                                      substring-before($outputstring,'ninja'))"/>
     860            </xsl:call-template>
     861          </xsl:when>
     862          <xsl:otherwise> <!-- ninja is the first word -->
     863            <xsl:text>DESTDIR=$PKG_DEST ninja</xsl:text>
     864            <xsl:call-template name="outputpkgdest">
     865              <xsl:with-param
     866                  name="outputstring"
     867                  select="substring-after($outputstring,'ninja')"/>
     868            </xsl:call-template>
     869          </xsl:otherwise>
     870        </xsl:choose>
     871      </xsl:when>
     872      <xsl:otherwise> <!-- no make nor ninja in this string -->
    849873        <xsl:choose>
    850874          <xsl:when test="contains($outputstring,'&gt;/') and
Note: See TracChangeset for help on using the changeset viewer.