Lines 1-6
Link Here
|
1 |
--- unix/Makefile.in.orig 2019-11-27 12:28:19 UTC |
1 |
--- unix/Makefile.in.orig 2019-11-27 12:28:19 UTC |
2 |
+++ unix/Makefile.in |
2 |
+++ unix/Makefile.in |
3 |
@@ -81,7 +81,7 @@ HTML_DIR = @HTML_DIR@ |
3 |
@@ -55,6 +55,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) |
|
|
4 |
|
5 |
# Directory in which to install the include file tcl.h: |
6 |
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) |
7 |
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic |
8 |
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix |
9 |
|
10 |
# Path to the private tcl header dir: |
11 |
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ |
12 |
@@ -81,7 +83,7 @@ HTML_DIR = @HTML_DIR@ |
4 |
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) |
13 |
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) |
5 |
|
14 |
|
6 |
# Directory in which to install the configuration file tclConfig.sh |
15 |
# Directory in which to install the configuration file tclConfig.sh |
Lines 9-15
Link Here
|
9 |
|
18 |
|
10 |
# Directory in which to install bundled packages: |
19 |
# Directory in which to install bundled packages: |
11 |
PACKAGE_DIR = @PACKAGE_DIR@ |
20 |
PACKAGE_DIR = @PACKAGE_DIR@ |
12 |
@@ -988,7 +988,7 @@ install-binaries: binaries |
21 |
@@ -988,7 +990,7 @@ install-binaries: binaries |
13 |
@EXTRA_INSTALL_BINARIES@ |
22 |
@EXTRA_INSTALL_BINARIES@ |
14 |
@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/" |
23 |
@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/" |
15 |
@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig |
24 |
@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig |
Lines 18-24
Link Here
|
18 |
|
27 |
|
19 |
install-libraries-zipfs-shared: libraries |
28 |
install-libraries-zipfs-shared: libraries |
20 |
@for i in "$(SCRIPT_INSTALL_DIR)"; do \ |
29 |
@for i in "$(SCRIPT_INSTALL_DIR)"; do \ |
21 |
@@ -1014,7 +1014,7 @@ install-libraries: libraries |
30 |
@@ -1014,7 +1016,7 @@ install-libraries: libraries |
22 |
$(INSTALL_DATA_DIR) "$$i"; \ |
31 |
$(INSTALL_DATA_DIR) "$$i"; \ |
23 |
fi; \ |
32 |
fi; \ |
24 |
done |
33 |
done |
Lines 27-33
Link Here
|
27 |
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ |
36 |
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ |
28 |
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ |
37 |
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ |
29 |
$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \ |
38 |
$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \ |
30 |
@@ -1026,28 +1026,31 @@ install-libraries: libraries |
39 |
@@ -1026,28 +1028,31 @@ install-libraries: libraries |
31 |
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ |
40 |
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ |
32 |
done |
41 |
done |
33 |
@echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/" |
42 |
@echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/" |
Lines 65-77
Link Here
|
65 |
@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/" |
74 |
@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/" |
66 |
@for i in $(TOP_DIR)/library/encoding/*.enc; do \ |
75 |
@for i in $(TOP_DIR)/library/encoding/*.enc; do \ |
67 |
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ |
76 |
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ |
68 |
@@ -1057,6 +1060,9 @@ install-libraries: libraries |
77 |
@@ -1057,7 +1062,10 @@ install-libraries: libraries |
69 |
echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ |
78 |
echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ |
70 |
"$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ |
79 |
"$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ |
71 |
fi |
80 |
fi |
72 |
+ echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \ |
81 |
+ echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \ |
73 |
+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; |
82 |
+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; |
|
|
83 |
|
74 |
+ |
84 |
+ |
75 |
|
|
|
76 |
install-tzdata: |
85 |
install-tzdata: |
77 |
@for i in tzdata; do \ |
86 |
@for i in tzdata; do \ |
|
|
87 |
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ |
88 |
@@ -1132,19 +1140,27 @@ TCL_PRIVATE_HEADERS = $(GENERIC_DIR)/tclInt.h $(GENERI |
89 |
$(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclPort.h \ |
90 |
$(GENERIC_DIR)/tclOOInt.h $(GENERIC_DIR)/tclOOIntDecls.h \ |
91 |
$(UNIX_DIR)/tclUnixPort.h |
92 |
+ |
93 |
+TCL_INSTALL_HEADERS = tcl.h tclDecls.h tclInt.h tclOO.h tclOODecls.h \ |
94 |
+ tclPlatDecls.h tclTomMath.h tclTomMathDecls.h |
95 |
+ |
96 |
# Any other headers you find in the Tcl sources are purely part of Tcl's |
97 |
# implementation, and aren't to be installed. |
98 |
|
99 |
install-headers: |
100 |
- @for i in "$(INCLUDE_INSTALL_DIR)"; do \ |
101 |
+ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ |
102 |
+ do \ |
103 |
if [ ! -d "$$i" ] ; then \ |
104 |
echo "Making directory $$i"; \ |
105 |
$(INSTALL_DATA_DIR) "$$i"; \ |
106 |
fi; \ |
107 |
done |
108 |
@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; |
109 |
- @for i in $(TCL_PUBLIC_HEADERS); do \ |
110 |
- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ |
111 |
+ @${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/ |
112 |
+ @${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/ |
113 |
+ @for i in $(TCL_INSTALL_HEADERS); do \ |
114 |
+ j=`basename $$i` ; \ |
115 |
+ ln -sf generic/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \ |
116 |
done |
117 |
|
118 |
# Optional target to install private headers |