Shorten variable name.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3548 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 37e80d3d7bfe695bfe454be2ae1755c23606755f..8d4b644917a0664c8905ac0beac9dbf1ceee3bc1 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -147,7 +147,7 @@ def userMkGenerator(project_info):
     mk_data = {}
     mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH"))
     mk_data["$ppath"] = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH"))
-    mk_data["$main"] = os.path.join("$(%s_PROJECT_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c")
+    mk_data["$main"] = os.path.join("$(%s_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c")
     for key in mk_data:
         while makefile.find(key) != -1:
             makefile = makefile.replace(key, mk_data[key])

diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk
index 5b866cd9017a713a529650fd8c4e0075ec57ad1b..801fa5110b4979d24fa1bbd04fb6b56b5baa5f46 100644 (file)
--- a/wizard/mktemplates/template.mk
+++ b/wizard/mktemplates/template.mk
@@ -13,7 +13,7 @@ $pname_PREFIX = "$prefix"
 
 $pname_SUFFIX = "$suffix"
 
-$pname_PROJECT_SRC_PATH = "$ppath"
+$pname_SRC_PATH = $ppath
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE $pname_USER_CSRC INSTEAD!
 $pname_WIZARD_CSRC = \