jhalfs git · trunk

jhalfs LFS build automation (mirror)

lfs mirror bash · first commit 2005-09-11 · last commit 2024-02-13 (2 years ago) · synced 3 days ago · upstream: git.linuxfromscratch.org/jhalfs

Python 78.4% Shell 19.8% Makefile 1.8%

git clone https://git.christianimmanuel.de/mirrors-forks/jhalfs.gitwget https://git.christianimmanuel.de/mirrors-forks/jhalfs/archive/jhalfs.tar.gz

outputpkgdest: don't mix make and qmake

Pierre Labastie · 2023-03-19 09:15 · 3fa41475157bd8481cc13473509fee252df8e2e6

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">