summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapnadkarni <apnmbx-wits@yahoo.com>2018-02-02 06:18:24 (GMT)
committerapnadkarni <apnmbx-wits@yahoo.com>2018-02-02 06:18:24 (GMT)
commite905a75c0faaeb0247ec38f423bd5efb77e55e62 (patch)
tree5ad09701cd3181b569eafc64877e0700ad04fd5b
parentee2574ddce0bec472ffb3eb2d61928203c7c4eef (diff)
parent73eb8eb8d197fc5f42b762a71e2331e21259f400 (diff)
downloadtcl-e905a75c0faaeb0247ec38f423bd5efb77e55e62.zip
tcl-e905a75c0faaeb0247ec38f423bd5efb77e55e62.tar.gz
tcl-e905a75c0faaeb0247ec38f423bd5efb77e55e62.tar.bz2
Fix INCLUDE_INSTALL_DIR def when building against Tcl source. Bump rules.vc to 1.2
-rw-r--r--win/rules.vc8
1 files changed, 4 insertions, 4 deletions
diff --git a/win/rules.vc b/win/rules.vc
index 2c61e2d..13b3fba 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
# For modifications that are not backward-compatible, you *must* change
# the major version.
RULES_VERSION_MAJOR = 1
-RULES_VERSION_MINOR = 1
+RULES_VERSION_MINOR = 2
# The PROJECT macro must be defined by parent makefile.
!if "$(PROJECT)" == ""
@@ -393,7 +393,7 @@ MSG = ^
!endif
-# If INSTALLDIR set to tcl installation root dir then reset to the
+# If INSTALLDIR set to Tcl installation root dir then reset to the
# lib dir for installing extensions
!if exist("$(_INSTALLDIR)\include\tcl.h")
_INSTALLDIR=$(_INSTALLDIR)\lib
@@ -1209,7 +1209,7 @@ RESFILE = $(TMP_DIR)\$(PROJECT).res
# SCRIPT_INSTALL_DIR - where scripts should be installed
# INCLUDE_INSTALL_DIR - where C include files should be installed
# DEMO_INSTALL_DIR - where demos should be installed
-# PRJ_INSTALL_DIR - where package will be installed (not set for tcl and tk)
+# PRJ_INSTALL_DIR - where package will be installed (not set for Tcl and Tk)
!if $(DOING_TCL) || $(DOING_TK)
LIB_INSTALL_DIR = $(_INSTALLDIR)\lib
@@ -1231,7 +1231,7 @@ BIN_INSTALL_DIR = $(PRJ_INSTALL_DIR)
DOC_INSTALL_DIR = $(PRJ_INSTALL_DIR)
SCRIPT_INSTALL_DIR = $(PRJ_INSTALL_DIR)
DEMO_INSTALL_DIR = $(PRJ_INSTALL_DIR)\demos
-INCLUDE_INSTALL_DIR = $(_TCLDIR)\include
+INCLUDE_INSTALL_DIR = $(_INSTALLDIR)\..\include
!endif