diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-11-18 08:53:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-11-18 08:53:34 (GMT) |
| commit | a53edf115ca4fd670cc24c9e7b108cad7bd93102 (patch) | |
| tree | 5f91f7415c5d526ae348846270aa5e4dca2ae89a | |
| parent | 1a587a5fb9ae486be89721efce8432fa540e5c4e (diff) | |
| parent | 0c95d1d7c2d07e8a422b8af055160e8009e7eeb4 (diff) | |
| download | tcl-a53edf115ca4fd670cc24c9e7b108cad7bd93102.zip tcl-a53edf115ca4fd670cc24c9e7b108cad7bd93102.tar.gz tcl-a53edf115ca4fd670cc24c9e7b108cad7bd93102.tar.bz2 | |
Merge trunk
| -rw-r--r-- | doc/msgcat.n | 2 | ||||
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rw-r--r-- | win/Makefile.in | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/doc/msgcat.n b/doc/msgcat.n index 7e46528..34e153d 100644 --- a/doc/msgcat.n +++ b/doc/msgcat.n @@ -384,7 +384,7 @@ the package. For example, a short \fBes.msg\fR might contain: .PP .CS namespace eval ::mypackage { - \fB::msgcat::mcflset\fR "Free Beer!" "Cerveza Gracias!" + \fB::msgcat::mcflset\fR "Free Beer" "Cerveza Gratis" } .CE .SH "RECOMMENDED MESSAGE SETUP FOR PACKAGES" diff --git a/unix/Makefile.in b/unix/Makefile.in index 9258207..ebbd61c 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -630,7 +630,7 @@ ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} @if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ - (cd ${TOP_DIR}/win; ${MAKE} tcldde14.dll tclreg13.dll); \ + (cd ${TOP_DIR}/win; ${MAKE} winextensions); \ fi rm -f $@ @MAKE_STUB_LIB@ diff --git a/win/Makefile.in b/win/Makefile.in index dde1cd8..00f5c99 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -420,7 +420,9 @@ all: binaries libraries doc packages tcltest: $(TCLSH) $(TEST_DLL_FILE) -binaries: $(TCL_STUB_LIB_FILE) @LIBRARIES@ $(DDE_DLL_FILE) $(REG_DLL_FILE) $(TCLSH) +binaries: $(TCL_STUB_LIB_FILE) @LIBRARIES@ winextensions $(TCLSH) + +winextensions: ${DDE_DLL_FILE} ${REG_DLL_FILE} libraries: |