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
|
$NetBSD: patch-aa,v 1.4 2008/08/19 16:14:24 joerg Exp $
--- Common.mk.in.orig 2000-06-14 09:48:25.000000000 +0200
+++ Common.mk.in
@@ -36,7 +36,8 @@ TKX_FULL_VERSION = @TKX_FULL_VERSION@
#------------------------------------------------------------------------------
# Programs and options used by build
#
-CC = @CC@
+CC = ${LIBTOOL} --mode=compile @CC@
+LD = ${LIBTOOL} --mode=link @CC@
CFLAGS = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
SYSCFLAGS = @SYSCFLAGS@
RANLIB = @RANLIB@
@@ -64,8 +65,6 @@ XLDLIBS=
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files. This is normally passed on the command line.
-INSTALL_ROOT =
-
#------------------------------------------------------------------------------
# Build and install directories.
srcbasedir = @srcbasedir@
@@ -73,8 +72,7 @@ bldbasedir = @bldbasedir@
prefix = @prefix@
exec_prefix = @exec_prefix@
-TCLX_PREFIX="${prefix}"
-TCLX_EXEC_PREFIX="${exec_prefix}"
+TCLX_EXEC_PREFIX=${TCLX_PREFIX}
TKX_PREFIX="${prefix}"
TKX_EXEC_PREFIX="${exec_prefix}"
@@ -133,8 +131,8 @@ TCL_BUILD_STUB_LIB_SPEC = @TCL_BUILD_S
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_SRC_DIR}/include/tcl/generic
+TCL_UNIX_DIR = ${TCL_SRC_DIR}/include/tcl/unix
#------------------------------------------------------------------------------
# Configuration information from tkConfig.sh.
@@ -161,11 +159,11 @@ TK_UNIX_DIR = ${TK_SRC_DIR}/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_GENERIC_DIR = ${TCL_EXEC_PREFIX}/include/tcl/generic
+TCL_UNIX_DIR = ${TCL_EXEC_PREFIX}/include/tcl/unix
TCL_LIBRARY_DIR = ${TCL_SRC_DIR}/library
-TK_GENERIC_DIR = ${TK_SRC_DIR}/generic
-TK_UNIX_DIR = ${TK_SRC_DIR}/unix
+TK_GENERIC_DIR = ${TK_EXEC_PREFIX}/include/tk/generic
+TK_UNIX_DIR = ${TK_EXEC_PREFIX}/include/tk/unix
TCLX_GENERIC_DIR = ${srcbasedir}/tcl/generic
TCLX_UNIX_SRC_DIR = ${srcbasedir}/tcl/unix
@@ -190,13 +188,13 @@ COMPAT_DIR = ${srcbasedir}/tcl/c
#------------------------------------------------------------------------------
# Installation directories.
-TCLX_INST_RUNTIME = ${TCLX_PREFIX}/lib/tclX${TCLX_VERSION}
-TKX_INST_RUNTIME = ${TKX_PREFIX}/lib/tkX${TKX_VERSION}
+TCLX_INST_RUNTIME = ${TCLX_PREFIX}/lib/tcl/tclX${TCLX_VERSION}
+TKX_INST_RUNTIME = ${TKX_PREFIX}/lib/tcl/tkX${TKX_VERSION}
TCLX_LIBRARY_PATH = ${TCLX_INST_RUNTIME}
TKX_LIBRARY_PATH = ${TKX_INST_RUNTIME}
-TCLX_EXEC_RUNTIME = ${TCLX_EXEC_PREFIX}/lib/tclX${TCLX_VERSION}
-TKX_EXEC_RUNTIME = ${TKX_EXEC_PREFIX}/lib/tkX${TKX_VERSION}
+TCLX_EXEC_RUNTIME = ${TCLX_EXEC_PREFIX}/lib/tcl/tclX${TCLX_VERSION}
+TKX_EXEC_RUNTIME = ${TKX_EXEC_PREFIX}/lib/tcl/tkX${TKX_VERSION}
TCLX_INST_BIN = ${TCLX_EXEC_PREFIX}/bin
TKX_INST_BIN = ${TKX_EXEC_PREFIX}/bin
|
