67 lines
3.5 KiB
Text
67 lines
3.5 KiB
Text
|
--- unix/Makefile.in.orig Wed Jul 23 09:03:24 2014
|
||
|
+++ unix/Makefile.in Sun Aug 17 15:22:06 2014
|
||
|
@@ -565,6 +565,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
||
|
rm -f $@
|
||
|
@MAKE_STUB_LIB@
|
||
|
|
||
|
+libtcl85.a: ${OBJS}
|
||
|
+ rm -f $@
|
||
|
+ ${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@
|
||
|
+
|
||
|
# Make target which outputs the list of the .o contained in the Tcl lib useful
|
||
|
# to build a single big shared library containing Tcl and other extensions.
|
||
|
# Used for the Tcl Plugin. -- dl
|
||
|
@@ -726,7 +730,6 @@ install-binaries: binaries
|
||
|
done;
|
||
|
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
|
||
|
@@INSTALL_LIB@
|
||
|
- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
|
||
|
@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
|
||
|
@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
|
||
|
@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
|
||
|
@@ -738,7 +741,7 @@ install-binaries: binaries
|
||
|
@EXTRA_INSTALL_BINARIES@
|
||
|
@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
|
||
|
@mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
|
||
|
- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
|
||
|
+ @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl85.pc
|
||
|
|
||
|
install-libraries: libraries $(INSTALL_TZDATA) install-msgs
|
||
|
@for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
|
||
|
@@ -749,7 +752,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
|
||
|
else true; \
|
||
|
fi; \
|
||
|
done;
|
||
|
- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \
|
||
|
+ @for i in opt0.4 http1.0 encoding modules modules/platform ../modules/85; \
|
||
|
do \
|
||
|
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
|
||
|
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
|
||
|
@@ -777,21 +780,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
|
||
|
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
|
||
|
done;
|
||
|
@echo "Installing package http 2.7.13 as a Tcl Module";
|
||
|
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.13.tm;
|
||
|
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/http-2.7.13.tm;
|
||
|
@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
|
||
|
@for i in $(TOP_DIR)/library/opt/*.tcl ; \
|
||
|
do \
|
||
|
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
|
||
|
done;
|
||
|
@echo "Installing package msgcat 1.5.2 as a Tcl Module";
|
||
|
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
|
||
|
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/msgcat-1.5.2.tm;
|
||
|
@echo "Installing package tcltest 2.3.8 as a Tcl Module";
|
||
|
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
|
||
|
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/tcltest-2.3.8.tm;
|
||
|
|
||
|
@echo "Installing package platform 1.0.14 as a Tcl Module";
|
||
|
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;
|
||
|
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/platform-1.0.14.tm;
|
||
|
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
|
||
|
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
|
||
|
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/modules/platform/shell-1.1.4.tm;
|
||
|
|
||
|
@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
|
||
|
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
|