72 lines
2.3 KiB
Text
72 lines
2.3 KiB
Text
$NetBSD: patch-aa,v 1.7 2009/02/17 19:53:02 joerg Exp $
|
|
|
|
--- Makefile.in.orig 2005-10-02 14:26:19.000000000 -0700
|
|
+++ 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,10 +188,12 @@ embedded-console.cc: $(CONSOLE_FILES) $(
|
|
$(TCL2C) et_console $(CONSOLE_FILES) > embedded-console.cc
|
|
|
|
install: force
|
|
- $(INSTALL) -m 644 *.h @prefix@/include
|
|
- $(INSTALL) tcl2c++ @prefix@/bin
|
|
- $(INSTALL) $(LIB_TCLCL) @prefix@/lib
|
|
- $(RANLIB) @prefix@/lib/$(LIB_TCLCL)
|
|
+ for f in idlecallback.h iohandler.h rate-variable.h tclcl-config.h tclcl-mappings.h tclcl.h timer.h tracedvar.h; do \
|
|
+ ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/include; \
|
|
+ done
|
|
+ ${INSTALL_PROGRAM} tcl2c++ ${DESTDIR}${PREFIX}/bin
|
|
+ ${INSTALL_SCRIPT} otcldoc ${DESTDIR}${PREFIX}/bin
|
|
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libtclcl.la ${DESTDIR}${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
|