XOLATILE approved naming

diff --git a/awake b/awake
index 82a01a4bf0653e60f3dc77cc54f6252d6d44a27d..d951b4e2a20645d7a2204966d2ac201f15fb9675 100755 (executable)
--- a/awake
+++ b/awake
@@ -69,7 +69,7 @@ BEGIN {
        if (list) {
                print bakenum": "$0
        } else if (select == bakenum) {
-               gsub(/\$@|@(FILE|FILENAME|NAME)/, filename)
+               gsub(/\$@|@(FILE_NAME|FILENAME|FILE|NAME)/, filename)
                gsub(/\$\*|@SHORT/, shortname)
                gsub(/\$\+|@ARGS/, extraargs)
                gsub(/@RECURS/, ARGV[0])

diff --git a/bake.l b/bake.l
index d38b089b148f9e319dc05b0cc81d7e408f737c71..50c3b3176d757904e77d7a982011348a6ad7fabb 100755 (executable)
--- a/bake.l
+++ b/bake.l
@@ -28,7 +28,7 @@ extern void shorten(char * filename, int n);
 
 SPACE [ \t\r\v\f]
                         /* Everything that can be backslashed */
-FILENAME (@FILENAME|@FILE|@NAME)
+FILENAME (@FILE_NAME|@FILENAME|@FILE|@NAME)
 CMD       @BAKE[[:space:]]
 MACROS   ({CMD}|@STOP|{FILENAME}|@SHORT|@ARGS|@LINE|@RECURS|$@|$*|$+|@\{)
 

diff --git a/shake b/shake
index 51d3b5c6485a447f47d970698ab310113c74f538..e2cf12064eefffa1a296a23d6900e51600d41120 100755 (executable)
--- a/shake
+++ b/shake
@@ -76,6 +76,7 @@ if [[ -n $line ]]; then
     line=${line//\$@/$input_file}
     line=${line//\$\*/${input_file%.*}}
     line=${line//\$+/$@}
+    line=${line//@FILE_NAME/$input_file}
     line=${line//@FILENAME/$input_file}
     line=${line//@SHORT/${input_file%.*}}
     line=${line//@ARGS/$@}