[jhalfs] 02/02: outputpkgdest: don't mix make and qmake

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository jhalfs.

commit 3fa41475157bd8481cc13473509fee252df8e2e6
Author: Pierre Labastie <[email protected]>
AuthorDate: Sun Mar 19 10:15:18 2023 +0100

    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.
---
 BLFS/xsl/scripts.xsl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index d5d0fa3..78f61ad 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -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">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page