From edd76b8920540e70e683a944e95fb917406919a6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Apr 2020 11:04:54 +0000
Subject: Let's test if "make install" works, for now without spaces in the
 path

---
 .travis.yml  |  4 +++-
 win/rules.vc | 25 +++++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65747b2..c3f203a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -364,9 +364,11 @@ matrix:
 before_install:
   - cd ${BUILD_DIR}
 install:
-  - ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1)
+  - mkdir $HOME/install
+  - ./configure ${CFGOPT} --prefix=$HOME/install || (cat config.log && exit 1)
 before_script:
   - export ERROR_ON_FAILURES=1
 script:
   - make all tcltest
   - make test
+  - make install
diff --git a/win/rules.vc b/win/rules.vc
index 84ed92a..490f9c3 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -302,7 +302,7 @@ TCLDIR          = $(_INSTALLDIR)\..
 _TCLDIR		= $(_INSTALLDIR)\..
 _TCL_H          = $(_TCLDIR)\include\tcl.h
 
-!else # exist(...) && ! $(NEED_TCL_SOURCE)
+!else # exist(...) && !$(NEED_TCL_SOURCE)
 
 !if [echo _TCLDIR = \> nmakehlp.out] \
    || [nmakehlp -L generic\tcl.h >> nmakehlp.out]
@@ -313,7 +313,7 @@ TCLINSTALL      = 0
 TCLDIR         = $(_TCLDIR)
 _TCL_H          = $(_TCLDIR)\generic\tcl.h
 
-!endif # exist(...) && ! $(NEED_TCL_SOURCE)
+!endif # exist(...) && !$(NEED_TCL_SOURCE)
 
 !endif # TCLDIR
 
@@ -537,7 +537,7 @@ NMAKEHLPC = nmakehlp.c
 !if exist("$(_TCLDIR)\lib\nmake\nmakehlp.c")
 NMAKEHLPC = $(_TCLDIR)\lib\nmake\nmakehlp.c
 !endif
-!else # ! $(TCLINSTALL)
+!else # !$(TCLINSTALL)
 !if exist("$(_TCLDIR)\win\nmakehlp.c")
 NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c
 !endif
@@ -685,8 +685,9 @@ LINKERFLAGS     = $(LINKERFLAGS) -ltcg
 # CONFIG_CHECK - 1 -> check current build configuration against Tcl
 #           configuration (ignored for Tcl itself)
 # _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build
-#           (CRT library should support this)
+#           (CRT library should support this, not needed for Tcl 9.x)
 # TCL_UTF_MAX=4 - forces a build allowing 4-byte UTF-8 sequences internally.
+#           (Not needed for Tcl 9.x)
 # Further, LINKERFLAGS are modified based on above.
 
 # Default values for all the above
@@ -755,6 +756,7 @@ TCL_THREADS    = 1
 USE_THREAD_ALLOC= 1
 !endif
 
+!if "$(TCL_MAJOR_VERSION)" == "8"
 !if [nmakehlp -f $(OPTS) "time64bit"]
 !message *** Force 64-bit time_t
 _USE_64BIT_TIME_T = 1
@@ -764,6 +766,7 @@ _USE_64BIT_TIME_T = 1
 !message *** Force allowing 4-byte UTF-8 sequences internally
 TCL_UTF_MAX = 4
 !endif
+!endif
 
 # Yes, it's weird that the "symbols" option controls DEBUG and
 # the "pdbs" option controls SYMBOLS. That's historical.
@@ -1112,7 +1115,7 @@ TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
 TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)
 TCL_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"
 
-!else # ! $(DOING_TCL)
+!else # !$(DOING_TCL)
 
 !if $(TCLINSTALL) # Building against an installed Tcl
 
@@ -1252,7 +1255,7 @@ BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin
 DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc
 !if $(DOING_TCL)
 SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
-MODULE_INSTALL_DIR	= $(_INSTALLDIR)\lib\tcl8
+MODULE_INSTALL_DIR	= $(_INSTALLDIR)\lib\tcl$(TCL_MAJOR_VERSION)
 !else # DOING_TK
 SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
 !endif
@@ -1334,7 +1337,7 @@ OPTDEFINES	= $(OPTDEFINES) /DTCL_NO_DEPRECATED
 !if $(USE_STUBS)
 # Note we do not define USE_TCL_STUBS even when building tk since some
 # test targets in tk do not use stubs
-!if ! $(DOING_TCL)
+!if !$(DOING_TCL)
 USE_STUBS_DEFS  = /DUSE_TCL_STUBS /DUSE_TCLOO_STUBS
 !if $(NEED_TK)
 USE_STUBS_DEFS  = $(USE_STUBS_DEFS) /DUSE_TK_STUBS
@@ -1358,6 +1361,7 @@ OPTDEFINES	= $(OPTDEFINES) /DTCL_CFG_DO64BIT
 OPTDEFINES	= $(OPTDEFINES) /DNO_STRTOI64=1
 !endif
 
+!if "$(TCL_MAJOR_VERSION)" == "8"
 !if "$(_USE_64BIT_TIME_T)" == "1"
 OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
 !endif
@@ -1367,6 +1371,7 @@ OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=4
 
 # _ATL_XP_TARGETING - Newer SDK's need this to build for XP
 COMPILERFLAGS  = /D_ATL_XP_TARGETING
+!endif
 
 # Like the TEA system only set this non empty for non-Tk extensions
 # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME
@@ -1767,13 +1772,13 @@ $<
 # When building an extension, certain configuration options should
 # match the ones used when Tcl was built. Here we check and
 # warn on a mismatch.
-!if ! $(DOING_TCL)
+!if !$(DOING_TCL)
 
 !if $(TCLINSTALL) # Building against an installed Tcl
 !if exist("$(_TCLDIR)\lib\nmake\tcl.nmake")
 TCLNMAKECONFIG = "$(_TCLDIR)\lib\nmake\tcl.nmake"
 !endif
-!else # ! $(TCLINSTALL) - building against Tcl source
+!else # !$(TCLINSTALL) - building against Tcl source
 !if exist("$(OUT_DIR)\tcl.nmake")
 TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"
 !endif
@@ -1796,7 +1801,7 @@ TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"
 
 !endif # TCLNMAKECONFIG
 
-!endif # ! $(DOING_TCL)
+!endif # !$(DOING_TCL)
 
 
 #----------------------------------------------------------
-- 
cgit v0.12