diff options
author | nijtmans <nijtmans> | 2010-12-03 09:19:39 (GMT) |
---|---|---|
committer | nijtmans <nijtmans> | 2010-12-03 09:19:39 (GMT) |
commit | ea3383df4de871af4befa8a8c0183d7f4b4d1cbd (patch) | |
tree | 84f06ceb25a53b5aff218927cade3aa04bcfc284 /win/Makefile.in | |
parent | 6c7ac341739cf01e0a6a385687b55339aa48e1eb (diff) | |
download | tcl-ea3383df4de871af4befa8a8c0183d7f4b4d1cbd.zip tcl-ea3383df4de871af4befa8a8c0183d7f4b4d1cbd.tar.gz tcl-ea3383df4de871af4befa8a8c0183d7f4b4d1cbd.tar.bz2 |
silence gcc warning when using -Wwrite-strings
silence gcc warning for non-IEEE platforms
[Patch #3116490] cross-compile Tcl mingw32 on unix.
This makes it possible to cross-compile Tcl/Tk for Windows (either 32-bit or 64-bit) out-of-the-box on UNIX, using mingw-w64 build tools.
Diffstat (limited to 'win/Makefile.in')
-rw-r--r-- | win/Makefile.in | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 74d006c..01adbdb 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.186 2010/11/28 23:20:11 kennykb Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.187 2010/12/03 09:19:39 nijtmans Exp $ VERSION = @TCL_VERSION@ @@ -141,17 +141,18 @@ ZLIB_DLL_FILE = zlib1.dll SHARED_LIBRARIES = $(TCL_DLL_FILE) @ZLIB_DLL_FILE@ STATIC_LIBRARIES = $(TCL_LIB_FILE) $(REG_LIB_FILE) $(DDE_LIB_FILE) -# TCL_EXE is the name of a tclsh executable that is available *BEFORE* running -# make for the first time. Certain build targets (make genstubs) need it to be -# available on the PATH. This executable should *NOT* be required just to do a -# normal build although it can be required to run make dist. -TCL_EXE = tclsh - TCLSH = tclsh$(VER)${EXESUFFIX} TCLTEST = tcltest${EXEEXT} CAT32 = cat32$(EXEEXT) MAN2TCL = man2tcl$(EXEEXT) +# For cross-compiled builds, TCL_EXE is the name of a tclsh executable that is +# available *BEFORE* running make for the first time. Certain build targets +# (make genstubs, make install) need it to be available on the PATH. This +# executable should *NOT* be required just to do a normal build although +# it can be required to run make dist. +TCL_EXE = @TCL_EXE@ + @SET_MAKE@ # Setting the VPATH variable to a list of paths will cause the Makefile to @@ -685,14 +686,12 @@ install-libraries: libraries install-tzdata install-msgs install-tzdata: @echo "Installing time zone data" - @TCL_LIBRARY="${LIBRARY_DIR}"; export TCL_LIBRARY; \ - ./$(TCLSH) "$(ROOT_DIR)/tools/installData.tcl" \ + @$(TCL_EXE) "$(ROOT_DIR)/tools/installData.tcl" \ "$(ROOT_DIR)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata" install-msgs: @echo "Installing message catalogs" - @TCL_LIBRARY="${LIBRARY_DIR}"; export TCL_LIBRARY; \ - ./$(TCLSH) "$(ROOT_DIR)/tools/installData.tcl" \ + @$(TCL_EXE) "$(ROOT_DIR)/tools/installData.tcl" \ "$(ROOT_DIR)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs" install-doc: doc |