Review fixes

Author: scaronni

dkms.8.in

@@ -954,18 +954,18 @@ Run no more than this number of jobs in parallel.
 Control how modules are compressed. By default, the highest available level of compression is used.
 .TP
 .B build_environment
-If the directive is set to any non null-value, the content of the directive will be imported into the DKMS shell with the
+If the directive is set to any non null-value, when building modules, the exported variables that are in the file will be imported into the DKMS shell with the
 .B source
-command when building modules.
+command.
 
 Can be used to specify a custom
 .B gcc
 installed in a custom path; and the variable
 .B $kernelver
-can be used to represent the target kernel version. Some examples:
+can be used inside the environment file to represent the target kernel version. Some examples:
 
 Define a custom script to point to a specific GCC (
-.B CC=/opt/gcc12/bin/gcc
+.B export CC=/opt/gcc12/bin/gcc
 ):
 .B build_environment="/opt/gcc12/env"
 

dkms.in

@@ -1380,12 +1380,6 @@ do_build()
 {
     [[ $kernelver && $arch ]] || die 16 "do_build: Empty \$kernelver or \$arch"
 
-    # Source build environment file if specified
-    if [[ -n "$build_environment" && -f "$build_environment" ]]; then
-        # shellcheck disable=SC1090
-        source "$build_environment"
-    fi
-
     # If the module has not been added, try to add it.
     if ! is_module_added "$module" "$module_version" ; then
         add_module
@@ -1479,6 +1473,12 @@ do_build()
         fi
     fi
 
+    # Source build environment file if specified
+    if [[ -n "$build_environment" && -f "$build_environment" ]]; then
+        # shellcheck disable=SC1090
+        source <( (source "$build_environment" &>/dev/null; export -p) )
+    fi
+
     # Check for missing BUILD_DEPENDS
     bd_missing=
     # shellcheck disable=SC2153

dkms_framework.conf.in

@@ -57,7 +57,8 @@
 # compress_zstd_opts="-q --rm -T0 -3"
 
 # Path to a file containing environment variables to be sourced by DKMS.
-# This file will be sourced for the build command.
+# This file will be sourced for the build command. $kernelver can be used in
+# the environment file to represent the target kernel version.
 # build_environment=""
 
 # Command to run at the end of every DKMS transaction, for example after a new