Moving the include parsing after variable allows us to use variables in

the include line.

diff --git a/util/common-functions.sh.in b/util/common-functions.sh.in
index 4734f6bb7d1cc37ea0eacdff79e81716819bdcb7..38e86bee608ac8fd490bb7845318510319cfd738 100644 (file)
--- a/util/common-functions.sh.in
+++ b/util/common-functions.sh.in
@@ -233,11 +233,6 @@ template ()
        }
        function template_line (line,   tmp,var)
         {
-               if (match(line, /^[#]INCLUDE /))
-               {
-                       include_file(substr(line,10));
-                       return
-               }
                 while (match(line, /[$][A-Za-z0-9_]+/))
                 {
                        if (substr(line,RSTART-1,1) == "\\")
@@ -253,6 +248,11 @@ template ()
                        }
                        line = substr(line,RSTART+RLENGTH)
                 }
+               if (match(line, /^[#]INCLUDE /))
+               {
+                       include_file(substr(line,10));
+                       return
+               }
                 print line;
         }