diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2017-11-15 13:18:00 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2017-11-15 13:18:00 (GMT) |
| commit | c4d4363abd0a6d7f54d613ba0aa5c319c0d8bd36 (patch) | |
| tree | 0b41916dd23ff73884608dc9af6f953775218ee8 /win/rules-ext.vc | |
| parent | 0197a30845c7644fe45ca1a4ec1fc0b9c9ee0c20 (diff) | |
| download | tcl-c4d4363abd0a6d7f54d613ba0aa5c319c0d8bd36.zip tcl-c4d4363abd0a6d7f54d613ba0aa5c319c0d8bd36.tar.gz tcl-c4d4363abd0a6d7f54d613ba0aa5c319c0d8bd36.tar.bz2 | |
Loosen restriction on where rules-ext.vc file is located.
Diffstat (limited to 'win/rules-ext.vc')
| -rw-r--r-- | win/rules-ext.vc | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/win/rules-ext.vc b/win/rules-ext.vc index 7de6055..ec84464 100644 --- a/win/rules-ext.vc +++ b/win/rules-ext.vc @@ -3,11 +3,25 @@ !ifndef _RULES_EXT_VC -!if !exist("rules-ext.vc") +# We need to run from the directory the parent makefile is located in. +# nmake does not tell us what makefile was used to invoke it so parent +# makefile has to set the MAKEFILEVC macro or we just make a guess and +# warn if we think that is not the case. +!if "$(MAKEFILEVC)" == "" + +!if exist("$(PROJECT).vc") +MAKEFILEVC = $(PROJECT).vc +!elseif exist("makefile.vc") +MAKEFILEVC = makefile.vc +!endif +!endif # "$(MAKEFILEVC)" == "" + +!if !exist("$(MAKEFILEVC)") MSG = ^ -You must run this makefile only from the directory it is in.^ -Please `cd` to its location first. -!error $(MSG) +You must run nmake from the directory containing the project makefile.^ +If you are doing that and getting this message, set the MAKEFILEVC^ +macro to the name of the project makefile. +!message WARNING: $(MSG) !endif !if "$(PROJECT)" == "tcl" |