summaryrefslogtreecommitdiff
path: root/devel/tcl-tclcl/patches/patch-aa
blob: f13dc8021ad7bb3affd0fbedd51ce8a1bd987487 (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
$NetBSD: patch-aa,v 1.4 2005/02/14 04:40:49 minskim Exp $

--- Makefile.in.orig	2005-01-19 13:21:21.000000000 -0600
+++ Makefile.in
@@ -52,6 +52,9 @@ TEST	= test
 RM	= rm -f
 PERL	= perl
 
+INSTALL_DATA = ${BSD_INSTALL_DATA}
+INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM}
+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
 
 CCOPT	= @V_CCOPT@
 STATIC	= @V_STATIC@
@@ -75,11 +78,11 @@ CFLAGS	= $(CCOPT) $(DEFINE)
 
 .cc.o:
 	@rm -f $@
-	$(CPP) -c $(CFLAGS) $(INCLUDES) -o $@ $*.cc
+	${LIBTOOL} --mode=compile $(CPP) -c $(CFLAGS) $(INCLUDES) -o $@ $*.cc
 
 .c.o:
 	@rm -f $@
-	$(CC) -c $(CFLAGS) $(INCLUDES) -o $@ $*.c
+	${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) $(INCLUDES) -o $@ $*.c
 
 
 GEN_DIR	= gen/
@@ -108,8 +111,8 @@ TCL_835_LIBRARY_FILES = \
 	$(TCL_BASE_LIBRARY_FILES) \
 	$(LIBRARY_TCL)/http2.4/http.tcl
 TCL_84_LIBRARY_FILES = \
-        $(TCL_BASE_LIBRARY_FILES) \
-	$(LIBRARY_TCL)/http2.4/http.tcl
+	$(TCL_BASE_LIBRARY_FILES) \
+	$(LIBRARY_TCL)/http2.5/http.tcl
 
 TCL_LIBRARY_FILES = \
 	@V_TCL_LIBRARY_FILES@
@@ -155,13 +158,12 @@ all:	$(TCL2C) $(LIB_TCLCL)
 
 $(TCL2C): tcl2c++.o
 	$(RM) $@
-	$(LINK) $(STATIC) $(LDFLAGS) $(LDOUT)$@ tcl2c++.o
+	${LIBTOOL} --mode=link $(LINK) $(LDOUT)$@ tcl2c++.o
 
 # We used to link to libTcl.a for backwards compatibilty, but no more.
 $(LIB_TCLCL): $(OBJ_CC) $(OBJ_COMPAT_C)
 	$(RM) $@
-	$(AR)$@ $(OBJ_CC) $(OBJ_COMPAT_C)
-	$(RANLIB) $@
+	${LIBTOOL} --mode=link ${CPP} -o ${.TARGET:.a=.la} $(OBJ_CC:.o=.lo) $(OBJ_COMPAT_C:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:0
 
 #
 # pass-1 embedded tcl files
@@ -186,9 +188,12 @@ embedded-console.cc: $(CONSOLE_FILES) $(
 	$(TCL2C) et_console $(CONSOLE_FILES) > embedded-console.cc
 
 install: force
-	$(INSTALL) *.h @prefix@/include
-	$(INSTALL) tcl2c++ @prefix@/bin
-	$(INSTALL) $(LIB_TCLCL) @prefix@/lib
+	for f in *.h ; do				\
+		${INSTALL_DATA} $$f ${PREFIX}/include;	\
+	done
+	${INSTALL_PROGRAM} tcl2c++ ${PREFIX}/bin
+	${INSTALL_SCRIPT} otcldoc ${PREFIX}/bin
+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libtclcl.la ${PREFIX}/lib
 
 # libTcl is no longer installed as of 13-Nov-99
 #	-test -f @prefix@/lib/libTcl.a && rm -f @prefix@/lib/libTcl.a || true