diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-10 12:21:56 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-10 12:21:56 (GMT) |
commit | 2d1dce6328cf2fdc16da8deab4610bfa6ea22fd5 (patch) | |
tree | 2196c80e139b2ee0ba98fe1c8cdb61b9fe135b44 /unix/configure.in | |
parent | b3e2e15abbb587934622dc562ca7d0e4b7c0a64e (diff) | |
download | tcl-2d1dce6328cf2fdc16da8deab4610bfa6ea22fd5.zip tcl-2d1dce6328cf2fdc16da8deab4610bfa6ea22fd5.tar.gz tcl-2d1dce6328cf2fdc16da8deab4610bfa6ea22fd5.tar.bz2 |
Introduce MODULE_INSTALL_DIR in make/nmake files, for compiling Tcl. Less use of ".." in the makefiles.
Adapt all makefiles (unix/win) such that they can handle spaces in LIB_INSTALL_DIR/SCRIPT_INSTALL_DIR/MODULE_INSTALL_DIR, just by adding double-quotes in appropriate places.
Diffstat (limited to 'unix/configure.in')
-rw-r--r-- | unix/configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure.in b/unix/configure.in index 5f708a5..8ab9672 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -826,7 +826,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then PRIVATE_INCLUDE_DIR="${libdir}/PrivateHeaders" HTML_DIR="${libdir}/Resources/Documentation/Reference/Tcl" EXTRA_INSTALL="install-private-headers html-tcl" - EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)"/TclTOC.html' + EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)/TclTOC.html"' EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tcl-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"' EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"' EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tcl.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tclConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."' @@ -881,7 +881,7 @@ fi # eval "TCL_STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" -eval "TCL_STUB_LIB_DIR=${libdir}" +eval "TCL_STUB_LIB_DIR=\"${libdir}\"" if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}" |