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

outputpkgdest: don't mix make and qmake

Browse source 
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:
Pierre Labastie 2023-03-19 10:15:18 +01:00
parent 6ac0d96300
commit 3fa4147515
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BLFS/xsl/scripts.xsl
View file

@ -944,7 +944,8 @@ echo Size after install: $(sudo du -skx --exclude home $BUILD_DIR) >> $INFOLOG
<xsl:template name="outputpkgdest"> <xsl:template name="outputpkgdest">
<xsl:param name="outputstring" select="'foo'"/> <xsl:param name="outputstring" select="'foo'"/>
<xsl:choose> <xsl:choose>
<xsl:when test="contains($outputstring,'make ')"> <xsl:when test="contains(normalize-space($outputstring),' make ') or
starts-with($outputstring, 'make ')">
<xsl:choose> <xsl:choose>
<xsl:when test="not(starts-with($outputstring,'make'))"> <xsl:when test="not(starts-with($outputstring,'make'))">
<xsl:call-template name="outputpkgdest"> <xsl:call-template name="outputpkgdest">