outputpkgdest: don't mix make and qmake
For outputting DESTDIR=, we need to test whether the text contains "make". But when it contains "qmake" (or any different word containing "make" but not exactly "make), we don't want to output anything more than the text. So strengthen the test.
This commit is contained in:
parent
6ac0d96300
commit
3fa4147515
1 changed files with 2 additions and 1 deletions
|
@ -944,7 +944,8 @@ echo Size after install: $(sudo du -skx --exclude home $BUILD_DIR) >> $INFOLOG
|
|||
<xsl:template name="outputpkgdest">
|
||||
<xsl:param name="outputstring" select="'foo'"/>
|
||||
<xsl:choose>
|
||||
<xsl:when test="contains($outputstring,'make ')">
|
||||
<xsl:when test="contains(normalize-space($outputstring),' make ') or
|
||||
starts-with($outputstring, 'make ')">
|
||||
<xsl:choose>
|
||||
<xsl:when test="not(starts-with($outputstring,'make'))">
|
||||
<xsl:call-template name="outputpkgdest">
|
||||
|
|
Reference in a new issue