Use more qualified tokens

src/include/build.sh

@@ -156,8 +156,8 @@ expand_variables() {
                 debug_var varname varvalue
             done
     done
-    echo "s|__CODENAME__|$CODENAME|;"     >> "$script"
-    echo "s|__VERSION__|$(get_version)|;" >> "$script"
+    echo "s|__MKIT_PROJ_CODENAME__|$CODENAME|;"     >> "$script"
+    echo "s|__MKIT_PROJ_VERSION__|$(get_version)|;" >> "$script"
     perl -wp "$script" || die "expand_variables failed"
     rm "$script"
 }

src/make.skel

@@ -6,7 +6,7 @@ die() {
     echo "$@" && exit 9
 }
 
-export MKIT_VERSION=__VERSION__
+export MKIT_VERSION=__MKIT_PROJ_VERSION__
 
 export MKIT_DIR=${MKIT_DIR:-$(dirname "$0")}
 export MKIT_LOCAL=${MKIT_LOCAL:-.mkit}