blob: 40fda9da67b170308fecd40c03cd09325d3ddda5 (
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
|
--- Common.mk.in.orig Sun Feb 6 18:54:02 2000
+++ Common.mk.in Thu Jul 13 13:54:11 2000
@@ -36,8 +36,7 @@
#------------------------------------------------------------------------------
# Programs and options used by build
#
-CC = @CC@
-CFLAGS = @CFLAGS@ @TCL_EXTRA_CFLAGS@
+CFLAGS += @TCL_EXTRA_CFLAGS@
SYSCFLAGS = @SYSCFLAGS@
RANLIB = @RANLIB@
AR = ar
@@ -115,6 +114,7 @@
#------------------------------------------------------------------------------
# Configuration information from tclConfig.sh.
#
+TCL_PREFIX = @TCL_PREFIX@
TCL_BIN_DIR = @TCL_BIN_DIR@
TCL_SRC_DIR = @TCL_SRC_DIR@
TCL_LIB_DIR = @TCL_BIN_DIR@
@@ -128,18 +128,19 @@
TCL_SHLIB_LD = @TCL_SHLIB_LD@
TCL_SHLIB_LD_LIBS = @TCL_SHLIB_LD_LIBS@
TCL_DBGX = @TCL_DBGX@
-TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
+TCL_BUILD_LIB_SPEC = @TCL_LIB_SPEC@
TCL_LIB_SPEC = @TCL_LIB_SPEC@
-TCL_BUILD_STUB_LIB_SPEC = @TCL_BUILD_STUB_LIB_SPEC@
+TCL_BUILD_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
-TCL_GENERIC_DIR = ${TCL_SRC_DIR}/generic
-TCL_UNIX_DIR = ${TCL_SRC_DIR}/unix
+TCL_GENERIC_DIR = ${TCL_PREFIX}/include/tcl${TCL_VERSION}/generic
+TCL_UNIX_DIR = ${TCL_PREFIX}/include/tcl${TCL_VERSION}/unix
#------------------------------------------------------------------------------
# Configuration information from tkConfig.sh.
#
+TK_PREFIX = @TK_PREFIX@
TK_BIN_DIR = @TK_BIN_DIR@
TK_SRC_DIR = @TK_SRC_DIR@
TK_LIB_DIR = @TK_BIN_DIR@
@@ -150,23 +151,18 @@
TK_XINCLUDES = @TK_XINCLUDES@
TK_XLIBSW = @TK_XLIBSW@
TK_DBGX = @TK_DBGX@
-TK_BUILD_LIB_SPEC = @TK_BUILD_LIB_SPEC@
+TK_BUILD_LIB_SPEC = @TK_LIB_SPEC@
TK_LIB_SPEC = @TK_LIB_SPEC@
-TK_BUILD_STUB_LIB_SPEC = @TK_BUILD_STUB_LIB_SPEC@
+TK_BUILD_STUB_LIB_SPEC = @TK_STUB_LIB_SPEC@
TK_STUB_LIB_SPEC = @TK_STUB_LIB_SPEC@
TK_LD_SEARCH_FLAGS = @TK_LD_SEARCH_FLAGS@
-TK_GENERIC_DIR = ${TK_SRC_DIR}/generic
-TK_UNIX_DIR = ${TK_SRC_DIR}/unix
+TK_GENERIC_DIR = ${TK_PREFIX}/include/tk${TK_VERSION}/generic
+TK_UNIX_DIR = ${TK_PREFIX}/include/tk${TK_VERSION}/unix
#------------------------------------------------------------------------------
# Location of directories in TclX source and build trees.
#
-TCL_GENERIC_DIR = ${TCL_SRC_DIR}/generic
-TCL_UNIX_DIR = ${TCL_SRC_DIR}/unix
-TCL_LIBRARY_DIR = ${TCL_SRC_DIR}/library
-TK_GENERIC_DIR = ${TK_SRC_DIR}/generic
-TK_UNIX_DIR = ${TK_SRC_DIR}/unix
TCLX_GENERIC_DIR = ${srcbasedir}/tcl/generic
TCLX_UNIX_SRC_DIR = ${srcbasedir}/tcl/unix
|
