59 lines
3.2 KiB
Plaintext
59 lines
3.2 KiB
Plaintext
$OpenBSD: patch-unix_Makefile_in,v 1.10 2012/11/19 15:09:52 stu Exp $
|
|
--- unix/Makefile.in.orig Fri Nov 9 10:14:39 2012
|
|
+++ unix/Makefile.in Wed Nov 14 07:50:42 2012
|
|
@@ -558,6 +558,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
|
|
@@ -719,7 +723,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)/"
|
|
@@ -739,7 +742,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/8.5 modules/8.5/platform ../modules/8.5; \
|
|
do \
|
|
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
|
|
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
|
|
@@ -767,21 +770,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
|
|
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
|
|
done;
|
|
@echo "Installing package http 2.7.10 as a Tcl Module";
|
|
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm;
|
|
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.10.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.0 as a Tcl Module";
|
|
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm;
|
|
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.5.0.tm;
|
|
@echo "Installing package tcltest 2.3.4 as a Tcl Module";
|
|
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
|
|
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.4.tm;
|
|
|
|
@echo "Installing package platform 1.0.10 as a Tcl Module";
|
|
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm;
|
|
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.10.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/8.5/platform/shell-1.1.4.tm;
|
|
|
|
@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
|
|
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
|