Correct a bug which could replace "makeinfo" with "make -j1info"

This commit is contained in:
Pierre Labastie 2013-11-17 08:26:47 +00:00
parent e58cf15308
commit 9c5ea2fa6f

View file

@ -479,9 +479,12 @@ popd</xsl:text>
<xsl:if test="(contains(string(),'test') or <xsl:if test="(contains(string(),'test') or
contains(string(),'check'))"> contains(string(),'check'))">
<xsl:text>#</xsl:text> <xsl:text>#</xsl:text>
<xsl:value-of select="substring-before(string(),'make')"/> <xsl:value-of select="substring-before(string(),'make ')"/>
<xsl:text>make -k</xsl:text> <xsl:text>make </xsl:text>
<xsl:value-of select="substring-after(string(),'make')"/> <xsl:if test="not(contains(string(),'-k'))">
<xsl:text>-k </xsl:text>
</xsl:if>
<xsl:value-of select="substring-after(string(),'make ')"/>
<xsl:text> || true&#xA;</xsl:text> <xsl:text> || true&#xA;</xsl:text>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
@ -562,15 +565,15 @@ popd</xsl:text>
<xsl:template name="output-root"> <xsl:template name="output-root">
<xsl:param name="out-string" select="''"/> <xsl:param name="out-string" select="''"/>
<xsl:choose> <xsl:choose>
<xsl:when test="contains($out-string,'make')"> <xsl:when test="contains($out-string,'make ')">
<xsl:call-template name="output-root"> <xsl:call-template name="output-root">
<xsl:with-param name="out-string" <xsl:with-param name="out-string"
select="substring-before($out-string,'make')"/> select="substring-before($out-string,'make ')"/>
</xsl:call-template> </xsl:call-template>
<xsl:text>make -j1</xsl:text> <xsl:text>make -j1 </xsl:text>
<xsl:call-template name="output-root"> <xsl:call-template name="output-root">
<xsl:with-param name="out-string" <xsl:with-param name="out-string"
select="substring-after($out-string,'make')"/> select="substring-after($out-string,'make ')"/>
</xsl:call-template> </xsl:call-template>
</xsl:when> </xsl:when>
<xsl:when test="contains($out-string,'$') and $sudo = 'y'"> <xsl:when test="contains($out-string,'$') and $sudo = 'y'">