From 9db723e6b99f00b6920bbebfbb62bab3ff796633 Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Thu, 13 Jul 2000 20:54:37 +0000 Subject: Import of tclX82 after repo-copy from tclX80, one more step on the road to obliterating tcl/tk 8.0 from the tree. Note 1: the patches have been extensively re-worked from the original submission, to make this port PREFIX-safe, and also to deal with multiple patchfiles updating the same source file. Note 2: I've left the MAINTAINER as jseger. Justin, you may want to cast your TCL-expert eye over this one, it seems to do the right thing. PR: 16970 Submitted by: Mikhail Teterin --- lang/tclX/files/patch-ac | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'lang/tclX/files/patch-ac') diff --git a/lang/tclX/files/patch-ac b/lang/tclX/files/patch-ac index 629c9d5ee7c8..32ddf413e4b9 100644 --- a/lang/tclX/files/patch-ac +++ b/lang/tclX/files/patch-ac @@ -1,29 +1,38 @@ ---- ../tk/unix/Makefile.in.orig Sun Dec 6 21:47:30 1998 -+++ ../tk/unix/Makefile.in Fri Aug 27 10:37:45 1999 -@@ -85,7 +85,7 @@ - # If a link fails, purge the executable, as some systems leave invalid - # executables around. +--- ../tk/unix/Makefile.in.orig Sun Feb 6 18:54:01 2000 ++++ ../tk/unix/Makefile.in Thu Jul 13 15:35:36 2000 +@@ -81,7 +81,7 @@ # --all: wishx RUNTIME tktest -+all: wishx RUNTIME + all: binaries libraries doc - static: wishx.static tktest.static +-binaries: wishx tktest ++binaries: wishx + + libraries: RUNTIME @@ -112,6 +112,7 @@ ${TCL_SHLIB_LD} -o ${TKX_SHLIB_NAME} ${SOBJS} \ - ${TK_BUILD_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \ - ${TCL_BUILD_LIB_SPEC} ${TCL_SHLIB_LD_LIBS} + ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \ + ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS} + ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'` hello: hello.c ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS} -@@ -223,9 +224,11 @@ +@@ -199,7 +200,7 @@ + buildhelp: + rm -rf ${HELP_DIR} help help.tmp + mkdir ${HELP_DIR} +- ${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \ ++ ${BLDMANHELP} ${TCLX_TOOLS_SRC_DIR}/tkmanpages \ + ${HELP_DIR} Tk.brf + + #------------------------------------------------------------------------------ +@@ -227,9 +228,11 @@ ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \ ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \ fi - ${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB} + ${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_RUNTIME} - if test "@BUILD_SHARED@" = "YES"; then \ + if test "@SHARED_BUILD@" = "1"; then \ ${INSTCOPY} ${TKX_SHLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB} ;\ + (cd ${INSTALL_ROOT}${TKX_INST_LIB} && \ + ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`) ;\ -- cgit v1.2.3