aboutsummaryrefslogtreecommitdiff
path: root/lang/tcl86/files/patch-unix-Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'lang/tcl86/files/patch-unix-Makefile.in')
-rw-r--r--lang/tcl86/files/patch-unix-Makefile.in202
1 files changed, 114 insertions, 88 deletions
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index 694159f900d0..ca29256a492b 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2012-09-17 15:07:09.000000000 +0200
-+++ Makefile.in 2012-09-17 17:29:57.000000000 +0200
+--- Makefile.in.orig 2012-12-20 16:02:15.000000000 +0100
++++ Makefile.in 2013-01-09 16:51:17.000000000 +0100
@@ -54,6 +54,8 @@
# Directory in which to install the include file tcl.h:
@@ -9,7 +9,7 @@
# Path to the private tcl header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
-@@ -80,7 +82,7 @@
+@@ -80,10 +82,10 @@
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
# Directory in which to install the configuration file tclConfig.sh
@@ -17,16 +17,11 @@
+CONFIG_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)
# Directory in which to install bundled packages:
- PACKAGE_DIR = @PACKAGE_DIR@
-@@ -103,7 +105,7 @@
- #CFLAGS = $(CFLAGS_DEBUG)
- #CFLAGS = $(CFLAGS_OPTIMIZE)
- #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@
-+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@
-
- # Flags to pass to the linker
- LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
+-PACKAGE_DIR = @PACKAGE_DIR@
++PACKAGE_DIR = $(SCRIPT_INSTALL_DIR)
+
+ # Package search path.
+ TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
@@ -601,9 +603,9 @@
# Start of rules
#--------------------------------------------------------------------------
@@ -39,52 +34,52 @@
libraries:
-@@ -614,11 +616,19 @@
+@@ -614,10 +616,15 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f $@
@MAKE_LIB@
+ @ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so
-+ if test "x@DL_OBJS" = "xtclLoadAout.o"; then \
-+ $(RANLIB) ${LIB_FILE}; \
-+ fi
-+
+ @if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\
+ cp ${ZLIB_DIR}/win32/zlib1.dll .;\
+ fi
+
+libtcl${SHORT_TCL_VER}.a: ${OBJS}
+ rm -f libtcl${SHORT_TCL_VER}.a
+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
+ ${RANLIB} libtcl${SHORT_TCL_VER}.a
- @if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\
- cp ${ZLIB_DIR}/win32/zlib1.dll .;\
- fi
--
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
- @MAKE_STUB_LIB@
-@@ -759,8 +769,8 @@
+@@ -758,13 +765,13 @@
+ # Installation rules
#--------------------------------------------------------------------------
- INSTALL_BASE_TARGETS = install-binaries install-libraries install-msgs $(INSTALL_TZDATA)
--INSTALL_DOC_TARGETS = install-doc
--INSTALL_PACKAGE_TARGETS = install-packages
-+INSTALL_DOC_TARGETS =
-+INSTALL_PACKAGE_TARGETS =
+-INSTALL_BASE_TARGETS = install-binaries install-libraries install-msgs $(INSTALL_TZDATA)
++INSTALL_BASE_TARGETS = install-binaries install-msgs $(INSTALL_TZDATA)
+ INSTALL_DOC_TARGETS = install-doc
+ INSTALL_PACKAGE_TARGETS = install-packages
INSTALL_DEV_TARGETS = install-headers
INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
- INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
-@@ -795,6 +805,12 @@
+-INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
+- $(INSTALL_PACKAGE_TARGETS) $(INSTALL_EXTRA_TARGETS)
++INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) \
++ $(INSTALL_EXTRA_TARGETS)
+
+ install: $(INSTALL_TARGETS)
+
+@@ -795,6 +802,11 @@
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
-+ @ln -sf $(LIB_FILE) "@DLL_INSTALL_DIR@"/libtcl${SHORT_TCL_VER}.so
-+ @echo "Installing libtcl${SHORT_TCL_VER}.a"
-+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
-+ "@DLL_INSTALL_DIR@"/libtcl${SHORT_TCL_VER}.a
-+ @(cd "@DLL_INSTALL_DIR@"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)
-+ @chmod 555 "@DLL_INSTALL_DIR@"/libtcl${SHORT_TCL_VER}.a
++ @ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so
++ @echo "Installing libtcl${SHORT_TCL_VER}.a to $(DLL_INSTALL_DIR)"
++ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
++ @(cd "@DLL_INSTALL_DIR@" && ${RANLIB} libtcl${SHORT_TCL_VER}.a)
++ @chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
-@@ -807,9 +823,9 @@
+@@ -807,12 +819,12 @@
@INSTALL_STUB_LIB@ ; \
fi
@EXTRA_INSTALL_BINARIES@
@@ -96,85 +91,116 @@
+ @$(INSTALL_DATA) tcl.pc $(prefix)/libdata/pkgconfig/tcl.pc
install-libraries: libraries
- @for i in "$(SCRIPT_INSTALL_DIR)"; \
-@@ -820,7 +836,7 @@
+- @for i in "$(SCRIPT_INSTALL_DIR)"; \
++ @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/encoding; \
+ do \
+ if [ ! -d "$$i" ] ; then \
+ echo "Making directory $$i"; \
+@@ -820,7 +832,19 @@
else true; \
fi; \
done;
- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
-+ @for i in opt0.4 http1.0 encoding ; \
++ @echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
++ @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
++ $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
++ do \
++ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
++ done;
++ @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
++ @for i in $(TOP_DIR)/library/encoding/*.enc ; do \
++ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
++ done;
++
++install-modules: libraries
++ @for i in opt0.4 http1.0 platform; \
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -848,13 +864,13 @@
+@@ -828,47 +852,33 @@
+ else true; \
+ fi; \
+ done;
+- @echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
+- @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
+- $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
+- do \
+- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
+- done;
+ @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/";
+ @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \
+ do \
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
+ done;
+ @echo "Installing package http 2.8.5 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.5.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.5.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;
-- @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;
-+# @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;
-
-- @echo "Installing package platform 1.0.10 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)"/msgcat-1.5.0.tm;
+ @echo "Installing package tcltest 2.3.5 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.5.tm;
+-
++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.5.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;
-- @echo "Installing package platform::shell 1.1.4 as a Tcl Module";
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/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;
-+# @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;
-+# @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;
-
- @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
- @for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-@@ -894,23 +910,23 @@
- else true; \
- fi; \
- done;
-- @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
-- @for i in $(TOP_DIR)/doc/*.1; do \
-- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
-- done
-+# @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
-+# @for i in $(TOP_DIR)/doc/*.1; do \
-+# $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
-+# done
-
- @echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
- @for i in $(TOP_DIR)/doc/*.3; do \
-- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
-+ ${BSD_INSTALL_MAN} $$i "${MAN3_INSTALL_DIR}"; \
- done
-
- @echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
- @for i in $(TOP_DIR)/doc/*.n; do \
-- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
-+ ${BSD_INSTALL_MAN} $$i "${MANN_INSTALL_DIR}"; \
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm;
++ @echo "Customizing tcl module path"; \
++ echo "if {![interp issafe]} { ::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)} }" >> \
++ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
+
+- @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
+- @for i in $(TOP_DIR)/library/encoding/*.enc ; do \
+- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
+- done;
+- @if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ]; then \
+- echo "Customizing tcl module path"; \
+- echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
+- "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
+- fi
+-
+-install-tzdata: ${NATIVE_TCLSH}
++install-tzdata:
+ @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
+- @${NATIVE_TCLSH} $(TOOL_DIR)/installData.tcl \
++ ./tclsh $(TOOL_DIR)/installData.tcl \
+ $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata
+
+ install-msgs:
+@@ -910,7 +920,7 @@
done
install-headers:
- @for i in "$(INCLUDE_INSTALL_DIR)"; \
-+ @for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
++ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
-@@ -918,15 +934,21 @@
- else true; \
+@@ -919,14 +929,21 @@
fi; \
done;
-- @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
+ @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
- $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
- $(GENERIC_DIR)/tclPlatDecls.h \
- $(GENERIC_DIR)/tclTomMath.h \
- $(GENERIC_DIR)/tclTomMathDecls.h ; \
-+ @for i in $(GENERIC_DIR)/*.h ; \
++ @for i in $(GENERIC_DIR)/*.h; \
+ do \
-+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
++ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)/"; \
+ done;
-+ @for i in $(UNIX_DIR)/*.h ; \
++ @for i in $(UNIX_DIR)/*.h; \
do \
- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
-+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
++ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)/"; \
done;
+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 10:52:58 +0000