Artifact
cee025d84588586605e28587bb2d39b8918b38f1:
Attachment "macosx_modulepath.diff" to
ticket [942881ffff]
added by
das
2004-08-26 22:54:04.
0000: 49 6e 64 65 78 3a 20 6d 61 63 6f 73 78 2f 4d 61 Index: macosx/Ma
0010: 6b 65 66 69 6c 65 0a 3d 3d 3d 3d 3d 3d 3d 3d 3d kefile.=========
0020: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0030: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0040: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0050: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 52 43 53 20 66 ==========.RCS f
0060: 69 6c 65 3a 20 2f 63 76 73 72 6f 6f 74 2f 74 63 ile: /cvsroot/tc
0070: 6c 2f 74 63 6c 2f 6d 61 63 6f 73 78 2f 4d 61 6b l/tcl/macosx/Mak
0080: 65 66 69 6c 65 2c 76 0a 72 65 74 72 69 65 76 69 efile,v.retrievi
0090: 6e 67 20 72 65 76 69 73 69 6f 6e 20 31 2e 31 35 ng revision 1.15
00a0: 0a 64 69 66 66 20 2d 75 20 2d 70 20 2d 72 31 2e .diff -u -p -r1.
00b0: 31 35 20 4d 61 6b 65 66 69 6c 65 0a 2d 2d 2d 20 15 Makefile.---
00c0: 6d 61 63 6f 73 78 2f 4d 61 6b 65 66 69 6c 65 09 macosx/Makefile.
00d0: 32 30 20 4a 75 6c 20 32 30 30 34 20 31 30 3a 32 20 Jul 2004 10:2
00e0: 33 3a 31 34 20 2d 30 30 30 30 09 31 2e 31 35 0a 3:14 -0000.1.15.
00f0: 2b 2b 2b 20 6d 61 63 6f 73 78 2f 4d 61 6b 65 66 +++ macosx/Makef
0100: 69 6c 65 09 32 36 20 41 75 67 20 32 30 30 34 20 ile.26 Aug 2004
0110: 31 35 3a 33 38 3a 33 34 20 2d 30 30 30 30 0a 40 15:38:34 -0000.@
0120: 40 20 2d 33 31 2c 36 20 2b 33 31 2c 37 20 40 40 @ -31,6 +31,7 @@
0130: 20 49 4e 53 54 41 4c 4c 5f 4d 41 4e 50 41 47 45 INSTALL_MANPAGE
0140: 53 20 09 3f 3d 20 0a 20 54 43 4c 5f 50 41 43 4b S .?= . TCL_PACK
0150: 41 47 45 5f 50 41 54 48 09 3f 3d 20 22 7e 2f 4c AGE_PATH.?= "~/L
0160: 69 62 72 61 72 79 2f 54 63 6c 20 2f 4c 69 62 72 ibrary/Tcl /Libr
0170: 61 72 79 2f 54 63 6c 20 2f 4e 65 74 77 6f 72 6b ary/Tcl /Network
0180: 2f 4c 69 62 72 61 72 79 2f 54 63 6c 20 2f 53 79 /Library/Tcl /Sy
0190: 73 74 65 6d 2f 4c 69 62 72 61 72 79 2f 54 63 6c stem/Library/Tcl
01a0: 20 5c 0a 20 09 09 09 20 20 20 20 7e 2f 4c 69 62 \. ... ~/Lib
01b0: 72 61 72 79 2f 46 72 61 6d 65 77 6f 72 6b 73 20 rary/Frameworks
01c0: 2f 4c 69 62 72 61 72 79 2f 46 72 61 6d 65 77 6f /Library/Framewo
01d0: 72 6b 73 20 2f 4e 65 74 77 6f 72 6b 2f 4c 69 62 rks /Network/Lib
01e0: 72 61 72 79 2f 46 72 61 6d 65 77 6f 72 6b 73 20 rary/Frameworks
01f0: 5c 0a 20 09 09 09 20 20 20 20 2f 53 79 73 74 65 \. ... /Syste
0200: 6d 2f 4c 69 62 72 61 72 79 2f 46 72 61 6d 65 77 m/Library/Framew
0210: 6f 72 6b 73 22 0a 2b 54 43 4c 5f 4d 4f 44 55 4c orks".+TCL_MODUL
0220: 45 5f 50 41 54 48 09 09 3f 3d 20 22 7e 2f 4c 69 E_PATH..?= "~/Li
0230: 62 72 61 72 79 2f 54 63 6c 20 2f 4c 69 62 72 61 brary/Tcl /Libra
0240: 72 79 2f 54 63 6c 20 2f 4e 65 74 77 6f 72 6b 2f ry/Tcl /Network/
0250: 4c 69 62 72 61 72 79 2f 54 63 6c 20 2f 53 79 73 Library/Tcl /Sys
0260: 74 65 6d 2f 4c 69 62 72 61 72 79 2f 54 63 6c 22 tem/Library/Tcl"
0270: 0a 20 0a 20 23 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d . . #-----------
0280: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0290: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
02a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
02b0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
02c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
02d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 20 23 20 ------------. #
02e0: 6d 65 74 61 20 74 61 72 67 65 74 73 0a 40 40 20 meta targets.@@
02f0: 2d 31 31 34 2c 37 20 2b 31 31 35 2c 37 20 40 40 -114,7 +115,7 @@
0300: 20 4f 42 4a 5f 44 49 52 09 09 09 3d 20 24 7b 4f OBJ_DIR...= ${O
0310: 42 4a 52 4f 4f 54 7d 2f 24 7b 42 55 49 4c 44 5f BJROOT}/${BUILD_
0320: 53 54 59 4c 45 7d 0a 20 0a 20 24 7b 50 52 4f 4a STYLE}. . ${PROJ
0330: 45 43 54 7d 3a 09 09 6f 76 65 72 72 69 64 65 20 ECT}:..override
0340: 49 4e 53 54 41 4c 4c 5f 52 4f 4f 54 20 3d 20 24 INSTALL_ROOT = $
0350: 7b 4f 42 4a 5f 44 49 52 7d 2f 0a 20 0a 2d 4d 41 {OBJ_DIR}/. .-MA
0360: 4b 45 5f 56 41 52 53 09 09 3a 3d 20 49 4e 53 54 KE_VARS..:= INST
0370: 41 4c 4c 5f 52 4f 4f 54 20 54 43 4c 5f 50 41 43 ALL_ROOT TCL_PAC
0380: 4b 41 47 45 5f 50 41 54 48 20 54 43 4c 5f 4c 49 KAGE_PATH TCL_LI
0390: 42 52 41 52 59 20 44 59 4c 49 42 5f 49 4e 53 54 BRARY DYLIB_INST
03a0: 41 4c 4c 5f 44 49 52 0a 2b 4d 41 4b 45 5f 56 41 ALL_DIR.+MAKE_VA
03b0: 52 53 09 09 3a 3d 20 49 4e 53 54 41 4c 4c 5f 52 RS..:= INSTALL_R
03c0: 4f 4f 54 20 54 43 4c 5f 50 41 43 4b 41 47 45 5f OOT TCL_PACKAGE_
03d0: 50 41 54 48 20 54 43 4c 5f 4d 4f 44 55 4c 45 5f PATH TCL_MODULE_
03e0: 50 41 54 48 20 54 43 4c 5f 4c 49 42 52 41 52 59 PATH TCL_LIBRARY
03f0: 20 44 59 4c 49 42 5f 49 4e 53 54 41 4c 4c 5f 44 DYLIB_INSTALL_D
0400: 49 52 0a 20 4d 41 4b 45 5f 41 52 47 53 5f 56 09 IR. MAKE_ARGS_V.
0410: 09 3d 20 24 28 66 6f 72 65 61 63 68 20 76 2c 24 .= $(foreach v,$
0420: 7b 4d 41 4b 45 5f 56 41 52 53 7d 2c 24 76 3d 24 {MAKE_VARS},$v=$
0430: 7b 24 76 7d 29 0a 20 65 78 70 6f 72 74 20 43 50 {$v}). export CP
0440: 50 52 4f 47 09 09 3a 3d 20 63 70 20 2d 70 0a 20 PROG..:= cp -p.
0450: 0a 49 6e 64 65 78 3a 20 75 6e 69 78 2f 4d 61 6b .Index: unix/Mak
0460: 65 66 69 6c 65 2e 69 6e 0a 3d 3d 3d 3d 3d 3d 3d efile.in.=======
0470: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0480: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0490: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
04a0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 52 43 53 ============.RCS
04b0: 20 66 69 6c 65 3a 20 2f 63 76 73 72 6f 6f 74 2f file: /cvsroot/
04c0: 74 63 6c 2f 74 63 6c 2f 75 6e 69 78 2f 4d 61 6b tcl/tcl/unix/Mak
04d0: 65 66 69 6c 65 2e 69 6e 2c 76 0a 72 65 74 72 69 efile.in,v.retri
04e0: 65 76 69 6e 67 20 72 65 76 69 73 69 6f 6e 20 31 eving revision 1
04f0: 2e 31 34 33 0a 64 69 66 66 20 2d 75 20 2d 70 20 .143.diff -u -p
0500: 2d 72 31 2e 31 34 33 20 4d 61 6b 65 66 69 6c 65 -r1.143 Makefile
0510: 2e 69 6e 0a 2d 2d 2d 20 75 6e 69 78 2f 4d 61 6b .in.--- unix/Mak
0520: 65 66 69 6c 65 2e 69 6e 09 31 38 20 41 75 67 20 efile.in.18 Aug
0530: 32 30 30 34 20 31 39 3a 35 39 3a 30 39 20 2d 30 2004 19:59:09 -0
0540: 30 30 30 09 31 2e 31 34 33 0a 2b 2b 2b 20 75 6e 000.1.143.+++ un
0550: 69 78 2f 4d 61 6b 65 66 69 6c 65 2e 69 6e 09 32 ix/Makefile.in.2
0560: 36 20 41 75 67 20 32 30 30 34 20 31 35 3a 33 38 6 Aug 2004 15:38
0570: 3a 33 34 20 2d 30 30 30 30 0a 40 40 20 2d 37 38 :34 -0000.@@ -78
0580: 2c 36 20 2b 37 38 2c 39 20 40 40 20 4d 41 4e 4e ,6 +78,9 @@ MANN
0590: 5f 49 4e 53 54 41 4c 4c 5f 44 49 52 09 3d 20 24 _INSTALL_DIR.= $
05a0: 28 4d 41 4e 5f 49 4e 53 54 41 4c 4c 5f 44 49 52 (MAN_INSTALL_DIR
05b0: 29 2f 6d 61 0a 20 23 20 50 61 63 6b 61 67 65 20 )/ma. # Package
05c0: 73 65 61 72 63 68 20 70 61 74 68 2e 0a 20 54 43 search path.. TC
05d0: 4c 5f 50 41 43 4b 41 47 45 5f 50 41 54 48 09 3d L_PACKAGE_PATH.=
05e0: 20 40 54 43 4c 5f 50 41 43 4b 41 47 45 5f 50 41 @TCL_PACKAGE_PA
05f0: 54 48 40 0a 20 0a 2b 23 20 54 63 6c 20 4d 6f 64 TH@. .+# Tcl Mod
0600: 75 6c 65 20 64 65 66 61 75 6c 74 20 70 61 74 68 ule default path
0610: 20 72 6f 6f 74 73 20 28 54 49 50 31 38 39 29 2e roots (TIP189).
0620: 0a 2b 54 43 4c 5f 4d 4f 44 55 4c 45 5f 50 41 54 .+TCL_MODULE_PAT
0630: 48 09 09 3d 0a 2b 0a 20 23 20 4c 69 62 72 61 72 H..=.+. # Librar
0640: 69 65 73 20 62 75 69 6c 74 20 77 69 74 68 20 6f ies built with o
0650: 70 74 69 6d 69 7a 61 74 69 6f 6e 20 73 77 69 74 ptimization swit
0660: 63 68 65 73 20 68 61 76 65 20 74 68 69 73 20 61 ches have this a
0670: 64 64 69 74 69 6f 6e 61 6c 20 65 78 74 65 6e 73 dditional extens
0680: 69 6f 6e 0a 20 54 43 4c 5f 44 42 47 58 09 09 3d ion. TCL_DBGX..=
0690: 20 40 54 43 4c 5f 44 42 47 58 40 0a 20 0a 40 40 @TCL_DBGX@. .@@
06a0: 20 2d 36 39 31 2c 36 20 2b 36 39 34 2c 31 31 20 -691,6 +694,11
06b0: 40 40 20 69 6e 73 74 61 6c 6c 2d 6c 69 62 72 61 @@ install-libra
06c0: 72 69 65 73 3a 20 6c 69 62 72 61 72 69 65 73 20 ries: libraries
06d0: 69 6e 73 74 61 6c 6c 2d 74 7a 64 0a 20 09 40 66 install-tzd. .@f
06e0: 6f 72 20 69 20 69 6e 20 24 28 54 4f 50 5f 44 49 or i in $(TOP_DI
06f0: 52 29 2f 6c 69 62 72 61 72 79 2f 65 6e 63 6f 64 R)/library/encod
0700: 69 6e 67 2f 2a 2e 65 6e 63 20 3b 20 64 6f 20 5c ing/*.enc ; do \
0710: 0a 20 09 09 24 28 49 4e 53 54 41 4c 4c 5f 44 41 . ..$(INSTALL_DA
0720: 54 41 29 20 24 24 69 20 24 28 53 43 52 49 50 54 TA) $$i $(SCRIPT
0730: 5f 49 4e 53 54 41 4c 4c 5f 44 49 52 29 2f 65 6e _INSTALL_DIR)/en
0740: 63 6f 64 69 6e 67 3b 20 5c 0a 20 09 64 6f 6e 65 coding; \. .done
0750: 3b 0a 2b 09 40 69 66 20 5b 20 2d 6e 20 22 24 28 ;.+.@if [ -n "$(
0760: 54 43 4c 5f 4d 4f 44 55 4c 45 5f 50 41 54 48 29 TCL_MODULE_PATH)
0770: 22 20 2d 61 20 2d 65 20 24 28 54 4f 50 5f 44 49 " -a -e $(TOP_DI
0780: 52 29 2f 6c 69 62 72 61 72 79 2f 74 6d 2e 74 63 R)/library/tm.tc
0790: 6c 20 5d 3b 20 74 68 65 6e 20 5c 0a 2b 09 20 20 l ]; then \.+.
07a0: 20 20 65 63 68 6f 20 22 43 75 73 74 6f 6d 69 7a echo "Customiz
07b0: 69 6e 67 20 74 63 6c 20 6d 6f 64 75 6c 65 20 70 ing tcl module p
07c0: 61 74 68 22 3b 20 5c 0a 2b 09 20 20 20 20 65 63 ath"; \.+. ec
07d0: 68 6f 20 22 3a 3a 74 63 6c 3a 3a 74 6d 3a 3a 72 ho "::tcl::tm::r
07e0: 6f 6f 74 73 20 7b 24 28 54 43 4c 5f 4d 4f 44 55 oots {$(TCL_MODU
07f0: 4c 45 5f 50 41 54 48 29 7d 22 20 3e 3e 20 5c 0a LE_PATH)}" >> \.
0800: 2b 09 20 20 20 20 20 20 20 20 24 28 53 43 52 49 +. $(SCRI
0810: 50 54 5f 49 4e 53 54 41 4c 4c 5f 44 49 52 29 2f PT_INSTALL_DIR)/
0820: 74 6d 2e 74 63 6c 3b 20 5c 0a 2b 09 66 69 0a 20 tm.tcl; \.+.fi.
0830: 0a 20 69 6e 73 74 61 6c 6c 2d 74 7a 64 61 74 61 . install-tzdata
0840: 3a 0a 20 09 40 65 63 68 6f 20 22 49 6e 73 74 61 :. .@echo "Insta
0850: 6c 6c 69 6e 67 20 74 69 6d 65 20 7a 6f 6e 65 20 lling time zone
0860: 64 61 74 61 22 0a data".
