Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision 1329b9f978942763882767fba67216ccd12362c7)
+++ general/prog/llvm.xml	(revision cbfa1534e0c0c1667c43d9502265fd6e8d24964f)
@@ -290,18 +290,18 @@
 cd       build &amp;&amp;
 
-CC=gcc CXX=g++                              \
-cmake -DCMAKE_INSTALL_PREFIX=/usr           \
-      -DCMAKE_SKIP_INSTALL_RPATH=ON         \
-      -DLLVM_ENABLE_FFI=ON                  \
-      -DCMAKE_BUILD_TYPE=Release            \
-      -DLLVM_BUILD_LLVM_DYLIB=ON            \
-      -DLLVM_LINK_LLVM_DYLIB=ON             \
-      -DLLVM_ENABLE_RTTI=ON                 \
-      -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
-      -DLLVM_BINUTILS_INCDIR=/usr/include   \
-      -DLLVM_INCLUDE_BENCHMARKS=OFF         \
-      -DCLANG_DEFAULT_PIE_ON_LINUX=ON       \
-      -DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang \
-      -Wno-dev -G Ninja ..                  &amp;&amp;
+CC=gcc CXX=g++                               \
+cmake -D CMAKE_INSTALL_PREFIX=/usr           \
+      -D CMAKE_SKIP_INSTALL_RPATH=ON         \
+      -D LLVM_ENABLE_FFI=ON                  \
+      -D CMAKE_BUILD_TYPE=Release            \
+      -D LLVM_BUILD_LLVM_DYLIB=ON            \
+      -D LLVM_LINK_LLVM_DYLIB=ON             \
+      -D LLVM_ENABLE_RTTI=ON                 \
+      -D LLVM_TARGETS_TO_BUILD="host;AMDGPU" \
+      -D LLVM_BINUTILS_INCDIR=/usr/include   \
+      -D LLVM_INCLUDE_BENCHMARKS=OFF         \
+      -D CLANG_DEFAULT_PIE_ON_LINUX=ON       \
+      -D CLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang \
+      -W no-dev -G Ninja ..                  &amp;&amp;
 ninja</userinput></screen>
 <!-- Commented out because myst-parser is not in BLFS and we cannot test
@@ -312,8 +312,8 @@
     </para>
 
-<screen remap="doc"><userinput>cmake -DLLVM_BUILD_DOCS=ON            \
-      -DLLVM_ENABLE_SPHINX=ON         \
-      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
-      -Wno-dev -G Ninja ..            &amp;&amp;
+<screen remap="doc"><userinput>cmake -D LLVM_BUILD_DOCS=ON            \
+      -D LLVM_ENABLE_SPHINX=ON         \
+      -D SPHINX_WARNINGS_AS_ERRORS=OFF \
+      -W no-dev -G Ninja ..            &amp;&amp;
 ninja docs-llvm-html  docs-llvm-man</userinput></screen>
 
@@ -440,5 +440,5 @@
 
     <para>
-      <parameter>-DLLVM_ENABLE_FFI=ON</parameter>: This switch allows
+      <parameter>-D LLVM_ENABLE_FFI=ON</parameter>: This switch allows
       <application>LLVM</application> to use
       <application>libffi</application>.
@@ -446,5 +446,5 @@
 
     <para>
-      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter>: This switch builds
+      <parameter>-D LLVM_BUILD_LLVM_DYLIB=ON</parameter>: This switch builds
       the libraries as static and links all of them into an unique shared one.
       This is the recommended way of building a shared library.
@@ -452,5 +452,5 @@
 
     <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch enables
+      <parameter>-D CMAKE_BUILD_TYPE=Release</parameter>: This switch enables
       compiler optimizations in order to speed up the code and reduce its size.
       It also disables some compile checks which are not necessary on a
@@ -459,5 +459,5 @@
 
     <para>
-      <parameter>-DLLVM_TARGETS_TO_BUILD="host;AMDGPU"</parameter>: This
+      <parameter>-D LLVM_TARGETS_TO_BUILD="host;AMDGPU"</parameter>: This
       switch enables building for the same target as the host, and also for
       the r600 AMD GPU used by the Mesa r600 and radeonsi drivers.
@@ -470,6 +470,6 @@
 
     <para>
-      <parameter>-DLLVM_LINK_LLVM_DYLIB=ON</parameter>: Used in conjunction with
-      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter>, this switch enables
+      <parameter>-D LLVM_LINK_LLVM_DYLIB=ON</parameter>: Used in conjunction with
+      <parameter>-D LLVM_BUILD_LLVM_DYLIB=ON</parameter>, this switch enables
       linking the tools against the shared library instead of the static ones.
       It slightly reduces their size and also ensures that llvm-config
@@ -478,5 +478,5 @@
 
     <para>
-      <parameter>-DLLVM_ENABLE_RTTI=ON</parameter>: This switch is used to
+      <parameter>-D LLVM_ENABLE_RTTI=ON</parameter>: This switch is used to
       build LLVM with run-time type information. This is required for building
       <xref linkend="mesa"/>.
@@ -484,5 +484,5 @@
 
     <para>
-      <parameter>-DLLVM_BINUTILS_INCDIR=/usr/include</parameter>: This switch
+      <parameter>-D LLVM_BINUTILS_INCDIR=/usr/include</parameter>: This switch
       is used to tell the build system the location of binutils headers,
       which were installed in LFS.  This allows the building of
@@ -493,5 +493,5 @@
 
     <para>
-      <parameter>-DLLVM_INCLUDE_BENCHMARKS=OFF</parameter>:
+      <parameter>-D LLVM_INCLUDE_BENCHMARKS=OFF</parameter>:
       is used to disable generation build targets for the LLVM
       benchmarks. This option requires additional code that
@@ -500,5 +500,5 @@
 
     <para>
-      <parameter>-DCLANG_DEFAULT_PIE_ON_LINUX=ON</parameter>: makes
+      <parameter>-D CLANG_DEFAULT_PIE_ON_LINUX=ON</parameter>: makes
       <option>-fpie</option> option the default when compiling programs.
       Together with the <xref linkend="gASLR"/> feature enabled in the kernel,
@@ -507,5 +507,5 @@
 
     <para>
-      <parameter>-DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang</parameter>:
+      <parameter>-D CLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang</parameter>:
       makes <command>clang</command> and <command>clang++</command>
       search <filename class='directory'>/etc/clang</filename> for
@@ -514,7 +514,7 @@
 
     <para>
-      <option>-DBUILD_SHARED_LIBS=ON</option>: if used instead of
-      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter> and
-      <parameter>-DLLVM_LINK_LLVM_DYLIB=ON</parameter>, builds all the
+      <option>-D BUILD_SHARED_LIBS=ON</option>: if used instead of
+      <parameter>-D LLVM_BUILD_LLVM_DYLIB=ON</parameter> and
+      <parameter>-D LLVM_LINK_LLVM_DYLIB=ON</parameter>, builds all the
       <application>LLVM</application> libraries (about 60) as shared
       libraries instead of static.
@@ -522,5 +522,5 @@
 
     <para>
-      <option>-DLLVM_ENABLE_DOXYGEN</option>: Enables the generation of
+      <option>-D LLVM_ENABLE_DOXYGEN</option>: Enables the generation of
       browsable HTML documentation if you have installed <xref
       linkend="doxygen"/>. You should run <command>make doxygen-html</command>
Index: general/prog/lua.xml
===================================================================
--- general/prog/lua.xml	(revision 1329b9f978942763882767fba67216ccd12362c7)
+++ general/prog/lua.xml	(revision cbfa1534e0c0c1667c43d9502265fd6e8d24964f)
@@ -148,5 +148,5 @@
 <screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
 make linux</userinput></screen>
-<!-- make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux
+<!-- make MYCFLAGS="-D LUA_COMPAT_5_2 -D LUA_COMPAT_5_1" linux
      The MYCFLAGS="" part was brought into the patch since optimization had to
      be turned off.
@@ -199,5 +199,5 @@
 
     <para>
-      <envar>MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1"</envar>: This
+      <envar>MYCFLAGS="- DLUA_COMPAT_5_2 -D LUA_COMPAT_5_1"</envar>: This
       environment variable includes compatibility layers with Lua 5.1 and 5.2
       in the build.
Index: general/prog/rust.xml
===================================================================
--- general/prog/rust.xml	(revision 1329b9f978942763882767fba67216ccd12362c7)
+++ general/prog/rust.xml	(revision cbfa1534e0c0c1667c43d9502265fd6e8d24964f)
@@ -173,5 +173,5 @@
       <xref linkend="libssh2"/>,
       <xref linkend="llvm"/>
-      (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
+      (built with -D LLVM_LINK_LLVM_DYLIB=ON so that rust can link to
       system LLVM instead of building its shipped version), and
       <xref linkend="sqlite"/>
