Changeset 1cb4c76 for LFS/lfs.xsl

Timestamp:

02/05/2018 10:30:01 AM (6 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

6613034

Parents:

4696ddd

Message:

Only output DESTDIR when the command is "ninja install"

File:

• LFS/lfs.xsl (modified) (2 diffs)

LFS/lfs.xsl

@@ -846 +846 @@
         </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">
@@ -857 +857 @@
                  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">