summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-27 18:51:40 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-27 18:51:40 (GMT)
commit3275986a1aad85bc313bd0c5ce901b5124dc61de (patch)
tree4bf71b2df7cbf822d0f422a9a581fb8601edf166
parent5d1b8bbdece14d4ef6e3e24a73c13f0d46d2d77a (diff)
parentf4e6a60dfb4f87476b5af1da6a0e1b3d9011db51 (diff)
downloadtcl-3275986a1aad85bc313bd0c5ce901b5124dc61de.zip
tcl-3275986a1aad85bc313bd0c5ce901b5124dc61de.tar.gz
tcl-3275986a1aad85bc313bd0c5ce901b5124dc61de.tar.bz2
merge
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
-rw-r--r--unix/tclConfig.sh.in2
-rw-r--r--unix/tclUnixFile.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure
index 86f3bd6..f605d8a 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9001,7 +9001,7 @@ else
else
MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@'
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 0d64cc7..4de157c 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2118,7 +2118,7 @@ dnl # preprocessing tests use only CPPFLAGS.
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
], [
MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ; ${RANLIB} [$]@'
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
])
])
diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
index 7e1d4af..d47e686 100644
--- a/unix/tclConfig.sh.in
+++ b/unix/tclConfig.sh.in
@@ -1,5 +1,5 @@
# tclConfig.sh --
-#
+#
# This shell script (for sh) is generated automatically by Tcl's
# configure script. It will create shell variables for most of
# the configuration options discovered by the configure script.
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 053adee..4a34b0b 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -51,9 +51,9 @@ TclpFindExecutable(
/* Strip '.exe' part. */
length -= 4;
}
- encoding = Tcl_GetEncoding(NULL, NULL);
- TclSetObjNameOfExecutable(
- Tcl_NewStringObj(name, length), encoding);
+ encoding = Tcl_GetEncoding(NULL, NULL);
+ TclSetObjNameOfExecutable(
+ Tcl_NewStringObj(name, length), encoding);
#else
const char *name, *p;
Tcl_StatBuf statBuf;