blob: c128f06c18ec51d52e45903be801b66e394b99c9 (
plain)
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
|
$NetBSD: patch-ab,v 1.1.1.1 2000/09/06 16:40:05 jwise Exp $
--- ../tcl/unix/Makefile.in.orig Sun Feb 6 19:53:59 2000
+++ ../tcl/unix/Makefile.in Tue Sep 5 19:23:03 2000
@@ -142,30 +142,23 @@
standalone: tcl.standalone tclXtest.standalone hello
tcl: tclXAppInit.o @TCLX_SHLIB_BUILD_REF@ @TCLX_STLIB_BUILD_REF@ Makefile
- ${CC} ${LD_SWITCHES} tclXAppInit.o ${ALL_LIBS} \
- -o $@ || (rm -f $@; exit 1)
+ ${LD} tclXAppInit.o -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl83 -lm
tcl.static: tclXAppInit.o @TCLX_STLIB_BUILD_REF@ Makefile
- ${CC} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} \
- -o $@ || (rm -f $@; exit 1)
+ ${LD} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} -o $@
tcl.standalone: tclXAppInitSA.o @TCLX_STLIB_BUILD_REF@ Makefile
- ${CC} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} \
- -o $@ || (rm -f $@; exit 1)
+ ${LD} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} -o $@
${TCLX_STLIB_NAME}: ${OBJS}
- ${AR} cr ${TCLX_STLIB_NAME} ${OBJS}
- ${RANLIB} ${TCLX_STLIB_NAME}
+# ${AR} cr ${TCLX_STLIB_NAME} ${OBJS}
+# ${RANLIB} ${TCLX_STLIB_NAME}
@TCLX_SHLIB_BUILD_TARGET@: ${SOBJS}
- rm -f ${TCLX_SHLIB_NAME}
- PATH=${TCL_UNIX_DIR}:${PATH}; export PATH; \
- TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
- LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
- ${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
+ ${LIBTOOL} @CC@ --mode=link -o ${TCLX_SHLIB_NAME:C/\.so.*/.la/} ${SOBJS:.o=.lo} -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl83 -lm -version-info 1:0
hello: hello.c
- ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
+ ${LD} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
#------------------------------------------------------------------------------
# Do some special checks to make sure TclX is built ok.
@@ -219,16 +212,13 @@
# Generate the test programs.
#
tclXtest: ${TEST_OBJS} ${TCLX_LIB_NAME}
- ${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \
- -o $@ || (rm -f $@; exit 1)
+ ${LD} ${TEST_OBJS} -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl83 -lm
tclXtest.static: ${TEST_OBJS} ${TCLX_STLIB_NAME}
- ${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \
- -o $@ || (rm -f $@; exit 1)
+ ${LD} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} -o $@
tclXtest.standalone: ${TEST_SAOBJS} ${TCLX_STLIB_NAME}
- ${CC} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \
- -o $@ || (rm -f $@; exit 1)
+ ${LD} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} -o $@
tclXtest.o: ${TCLX_GENERIC_DIR}/tclXtest.c
${CC} -c ${CC_SWITCHES} ${TCLX_GENERIC_DIR}/tclXtest.c
@@ -320,29 +310,24 @@
install-doc:
-install-misc: buildhelp
- ${INSTCOPY} ${TCLX_GENERIC_DIR}/tclExtend.h \
- ${INSTALL_ROOT}${TCLX_INST_INCL}
- ${INSTCOPY} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c \
- ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
- ${INSTCOPY} ${HELP_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
+install-misc:
+ -${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+ ${BSD_INSTALL_DATA} ${TCLX_GENERIC_DIR}/tclExtend.h ${INSTALL_ROOT}${TCLX_INST_INCL}
+ ${BSD_INSTALL_DATA} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+ ${BSD_INSTALL_DATA_DIR} ${HELP_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
+ cd ${HELP_DIR} && ${GTAR} cf - . | (cd ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help && ${GTAR} xf -)
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
install-runtime:
- ${INSTCOPY} tclx.tcl tcl.tlib tcl.tndx buildidx.tcl autoload.tcl \
- ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+ -${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+ ${BSD_INSTALL_DATA} tclx.tcl tcl.tlib tcl.tndx buildidx.tcl autoload.tcl ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
install-exec:
- ${INSTCOPY} tcl ${INSTALL_ROOT}${TCLX_INST_BIN}
- ${STRIP} ${INSTALL_ROOT}${TCLX_INST_BIN}/tcl
- if test "X@TCLX_STLIB_BUILD_REF@" != "X"; then \
- ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \
- ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \
- fi
- ${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
- if test "@SHARED_BUILD@" = "1"; then \
- ${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
- ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
- fi
+ -${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME}
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} tcl ${INSTALL_ROOT}${TCLX_INST_BIN}
+ ${BSD_INSTALL_SCRIPT} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TCLX_SHLIB_NAME:C/\.so.*/.la/} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
+ ${BSD_INSTALL_DATA} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
#------------------------------------------------------------------------------
config:
|
