95 lines
3.2 KiB
Text
95 lines
3.2 KiB
Text
$NetBSD: patch-aa,v 1.14 2005/02/21 23:58:35 adam Exp $
|
|
|
|
--- Makefile.in.orig 2004-11-19 18:49:51.000000000 +0000
|
|
+++ Makefile.in
|
|
@@ -172,8 +172,8 @@ SHELL = /bin/sh
|
|
INSTALL_STRIP_PROGRAM = -s
|
|
INSTALL_STRIP_LIBRARY = -S -S
|
|
|
|
-INSTALL = @srcdir@/install-sh -c
|
|
-INSTALL_PROGRAM = ${INSTALL}
|
|
+INSTALL := ${LIBTOOL} --mode=install @srcdir@/install-sh -c
|
|
+INSTALL_PROGRAM = ${INSTALL} -s
|
|
INSTALL_LIBRARY = ${INSTALL}
|
|
INSTALL_DATA = ${INSTALL} -m 644
|
|
|
|
@@ -191,7 +191,7 @@ TCL_EXE = tclsh
|
|
# these definitions by hand.
|
|
|
|
STLIB_LD = @STLIB_LD@
|
|
-SHLIB_LD = @SHLIB_LD@
|
|
+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
|
|
SHLIB_CFLAGS = @SHLIB_CFLAGS@
|
|
SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@
|
|
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
|
@@ -217,6 +217,7 @@ BUILD_DLTEST = @BUILD_DLTEST@
|
|
#BUILD_DLTEST =
|
|
|
|
TCL_LIB_FILE = @TCL_LIB_FILE@
|
|
+TCL_LA_FILE = ${TCL_LIB_FILE:@SHLIB_SUFFIX@=.la}
|
|
#TCL_LIB_FILE = libtcl.a
|
|
|
|
# Generic lib name used in rules that apply to tcl and tk
|
|
@@ -254,8 +255,9 @@ DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest
|
|
# Must be absolute to so the corresponding tcltest's tcl_library is absolute.
|
|
TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library
|
|
|
|
-CC = @CC@
|
|
#CC = purify -best-effort @CC@ -DPURIFY
|
|
+CC = ${LIBTOOL} --mode=compile @CC@
|
|
+LD = ${LIBTOOL} --mode=link @CC@
|
|
|
|
# Flags to be passed to installManPage to control whether the manpages
|
|
# should be compressed and linked with softlinks
|
|
@@ -447,7 +449,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
|
|
|
|
all: binaries libraries doc
|
|
|
|
-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
|
|
+binaries: ${TCL_LA_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
|
|
|
|
libraries:
|
|
|
|
@@ -455,7 +457,7 @@ doc:
|
|
|
|
# The following target is configured by autoconf to generate either
|
|
# a shared library or non-shared library for Tcl.
|
|
-${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
|
|
+${TCL_LA_FILE}: ${OBJS} ${STUB_LIB_FILE}
|
|
rm -f $@
|
|
@MAKE_LIB@
|
|
|
|
@@ -475,8 +477,8 @@ tclLibObjs:
|
|
objs: ${OBJS}
|
|
|
|
|
|
-tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
|
|
- ${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
|
|
+tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE}
|
|
+ ${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
|
|
${CC_SEARCH_FLAGS} -o tclsh
|
|
|
|
# Resetting the LIB_RUNTIME_DIR below is required so that
|
|
@@ -484,11 +486,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
|
|
# burned into its ld search path. This keeps tcltest from
|
|
# picking up an already installed version of the Tcl library.
|
|
|
|
-tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
|
|
+tcltest: ${TCLTEST_OBJS} ${TCL_LA_FILE} ${BUILD_DLTEST}
|
|
$(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
|
|
|
|
tcltest-real:
|
|
- ${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
|
|
+ ${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
|
|
${CC_SEARCH_FLAGS} -o tcltest
|
|
|
|
# Note, in the target below TCL_LIBRARY needs to be set or else
|
|
@@ -1040,7 +1042,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
|
|
|
|
xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
|
|
@DL_OBJS@ ${BUILD_DLTEST}
|
|
- ${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
|
|
+ ${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
|
|
@DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \
|
|
${CC_SEARCH_FLAGS} -L/usr/openwin/lib -lXt -o xttest
|
|
|