aboutsummaryrefslogtreecommitdiffstats
path: root/lang/tcl84/files/patch-aa
blob: fb257bf34bdeed30ebd9eb62e13d237b96fe98a1 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
--- Makefile.in.orig    2008-04-17 22:29:49.000000000 +0200
+++ Makefile.in 2009-02-26 11:41:29.840998305 +0100
@@ -57,6 +57,8 @@
 
 # Directory in which to install the include file tcl.h:
 INCLUDE_INSTALL_DIR    = $(INSTALL_ROOT)$(includedir)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
 
 # Path to the private tcl header dir:
 PRIVATE_INCLUDE_DIR    = @PRIVATE_INCLUDE_DIR@
@@ -102,7 +104,7 @@
 #CFLAGS            = $(CFLAGS_DEBUG)
 #CFLAGS            = $(CFLAGS_OPTIMIZE)
 #CFLAGS            = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS         = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)
+CFLAGS         += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)
 
 # Flags to pass to the linker
 LDFLAGS_DEBUG      = @LDFLAGS_DEBUG@
@@ -469,7 +471,8 @@
 
 all: binaries libraries doc
 
-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
+   libtcl${SHORT_TCL_VER}.a tclsh
 
 libraries:
 
@@ -480,6 +483,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
+
+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
 
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
    rm -f $@
@@ -606,7 +618,7 @@
 dltest.marker: ${STUB_LIB_FILE}
    cd dltest ; $(MAKE)
 
-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@
+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
 
 install: $(INSTALL_TARGETS)
 
@@ -635,6 +647,12 @@
    @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
    @@INSTALL_LIB@
    @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
+   @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
+   @echo "Installing libtcl${SHORT_TCL_VER}.a"
+   @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
+       $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
+   @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)
+   @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
    @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
        echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
        $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
@@ -642,8 +660,9 @@
        fi
    @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
    @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
-   @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
-   @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
+   @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
+   @mkdir -p $(SCRIPT_INSTALL_DIR)
+   @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
    @if test "$(STUB_LIB_FILE)" != "" ; then \
        echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
        @INSTALL_STUB_LIB@ ; \
@@ -651,7 +670,8 @@
    @EXTRA_INSTALL_BINARIES@
 
 install-libraries: libraries
-   @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+   @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
+         $(SCRIPT_INSTALL_DIR); \
        do \
        if [ ! -d $$i ] ; then \
        echo "Making directory $$i"; \
@@ -673,11 +693,17 @@
        chmod +x $(SRC_DIR)/install-sh; \
        fi
    @echo "Installing header files";
-   @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
-       $(GENERIC_DIR)/tclPlatDecls.h; \
+   @for i in $(GENERIC_DIR)/*.h ; \
+       do \
+       $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+       done;
+   @for i in $(UNIX_DIR)/*.h ; \
        do \
-       $(INSTALL_DATA) $$i $(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
+   @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h
    @echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
    @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
        $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \
@@ -727,20 +753,20 @@
        else true; \
        fi; \
        done;
-   @echo "Installing and cross-linking top-level (.1) docs";
-   @for i in $(TOP_DIR)/doc/*.1; do \
-       $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
-   done
 
-   @echo "Installing and cross-linking C API (.3) docs";
-   @for i in $(TOP_DIR)/doc/*.3; do \
-       $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
-   done
+   @echo "Installing C API (.3) docs";
+   ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)/
 
-   @echo "Installing and cross-linking command (.n) docs";
-   @for i in $(TOP_DIR)/doc/*.n; do \
-       $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
-   done
+   @echo "Installing command (.n) docs";
+   ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)/
+   @echo "**********"
+   @echo "IMPORTANT:"
+   @echo "**********"
+   @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
+   @echo "tcl.h        in $(INCLUDE_INSTALL_DIR)/tcl.h"
+   @echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
+   @echo "There are NOT default place, but good place to avoid"
+   @echo "conflicting with another version of Tcl/Tks."
 
 # Optional target to install private headers
 install-private-headers: libraries