Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

1 files changed, 7 insertions, 1 deletions

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 0835dc2a8aa9..8aaf74e64183 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1665,11 +1665,17 @@ sub xml_escape($) {
 }
 
 sub process_file($) {
-    my ($file) = "$ENV{'SRCTREE'}@_";
+    my $file;
     my $identifier;
     my $func;
     my $initial_section_counter = $section_counter;
 
+    if (defined($ENV{'SRCTREE'})) {
+        $file = "$ENV{'SRCTREE'}" . "/" . "@_";
+    }
+    else {
+        $file = "@_";
+    }
     if (defined($source_map{$file})) {
         $file = $source_map{$file};
     }