aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Labastie <pierre.labastie@neuf.fr>2023-11-17 13:59:06 +0100
committerPierre Labastie <pierre.labastie@neuf.fr>2023-11-17 13:59:06 +0100
commitda4bce358df104cc3e0ed59503eafb8c92c0db1e (patch)
tree84699ecfdd6ca8d1f6a3e19af3fc1f5e3dc70687
parentd18fc24d5be19579426b6da1f5db75beb3d9a6da (diff)
Fix blfs tools Makefile now that MAKEFLAGS is set
Previously, the "update" target was just added to the end of the "all" target prerequisites, so that it was run at the end. But now, we enter make with some -j value in MAKEFLAGS, so that the "update" target may well be run before the other targets, which is wrong: for example if it is run before the "xxx-z-libxslt" target, xsltproc is not found and the update target fails. To fix, define "update" as the default target, and have it depend on "all".
-rw-r--r--common/libs/func_install_blfs4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs
index 4261932e72..32a7851f84 100644
--- a/common/libs/func_install_blfs
+++ b/common/libs/func_install_blfs
@@ -218,10 +218,10 @@ pushd $BUILDDIR$BLFS_ROOT/work
# installation, using libxslt, which is not installed yet. So move
# updating to the end of the process, adding an 'update' target
sed -i -e '/xsltproc/,+6d' \
- -e '/^all/s@$@ update@' \
+ -e '/^all/i update:' \
-e 's/touch/@touch/' Makefile
cat >> Makefile << EOF
-update:
+update: all
@echo Updating the tracking file
@for pack in \$\$(grep '<productname' ../$LFS_XML/tmp/lfs-full.xml | \\
sed 's/.*>\([^<]*\)<.*/\1/' | \\