diff options
| author | José Ignacio Marín <jima00@gmail.com> | 2020-10-20 20:41:19 (GMT) |
|---|---|---|
| committer | José Ignacio Marín <jima00@gmail.com> | 2020-10-20 20:41:19 (GMT) |
| commit | b502cdbf572fbb9aaa188167489f6b0ab38a7ed5 (patch) | |
| tree | bdd652d94af8f2d16e4177dea64c25a9a77ceee2 | |
| parent | 8ac4aee0fc7e4d4020c874ab41fecad788d1c848 (diff) | |
| parent | 28e7632fe69326aedc538c79816b654e3fd90558 (diff) | |
| download | tcl-b502cdbf572fbb9aaa188167489f6b0ab38a7ed5.zip tcl-b502cdbf572fbb9aaa188167489f6b0ab38a7ed5.tar.gz tcl-b502cdbf572fbb9aaa188167489f6b0ab38a7ed5.tar.bz2 | |
Update TZ info to tzdata2020c (via merge).
| -rw-r--r-- | library/tzdata/Pacific/Fiji | 2 | ||||
| -rw-r--r-- | macosx/GNUmakefile | 3 | ||||
| -rw-r--r-- | macosx/README | 11 |
3 files changed, 15 insertions, 1 deletions
diff --git a/library/tzdata/Pacific/Fiji b/library/tzdata/Pacific/Fiji index e316b93..a062913 100644 --- a/library/tzdata/Pacific/Fiji +++ b/library/tzdata/Pacific/Fiji @@ -29,7 +29,7 @@ set TZData(:Pacific/Fiji) { {1547301600 43200 0 +12} {1573308000 46800 1 +12} {1578751200 43200 0 +12} - {1604757600 46800 1 +12} + {1608386400 46800 1 +12} {1610805600 43200 0 +12} {1636812000 46800 1 +12} {1642255200 43200 0 +12} diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index 04c2230..2b817c0 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -150,6 +150,9 @@ install-${PROJECT}: build-${PROJECT} ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_) @echo "Cannot install-embedded with empty INSTALL_ROOT !" && false endif +ifeq (${SUBFRAMEWORK}_${DYLIB_INSTALL_DIR},1_) + @echo "Cannot install-subframework with empty DYLIB_INSTALL_DIR !" && false +endif ifeq (${EMBEDDED_BUILD},1) @rm -rf "${INSTALL_ROOT}${LIBDIR}/Tcl.framework" endif diff --git a/macosx/README b/macosx/README index 49953c2..5e53e64 100644 --- a/macosx/README +++ b/macosx/README @@ -165,3 +165,14 @@ If you only want to build and install the debug or optimized build, use the For example, to build and install only the optimized versions: make -C tcl${ver}/macosx deploy sudo make -C tcl${ver}/macosx install-deploy + +- To build a Tcl.framework for use as a subframework in another framework, use the +install-embedded target and set SUBFRAMEWORK=1. Set the DYLIB_INSTALL_DIR +variable to the path which should be the install_name path of the Tcl library, set +the DESTDIR variable to the pathname of a staging directory where the framework +will be written . For example, running this command in the Tcl source directory: + make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcl \ + DYLIB_INSTALL_DIR=/Library/Frameworks/Some.framework/Versions/3.9/Frameworks/Tcl +will produce a Tcl.framework intended for installing as a subframework of the +Python.framework. The framework will be found in /tmp/tcl/Library/Frameworks/ + |