86 lines
3.2 KiB
Text
86 lines
3.2 KiB
Text
$NetBSD: patch-aa,v 1.3 2005/11/04 09:56:09 rillig Exp $
|
|
|
|
--- unix/Makefile.in.orig 2001-10-20 10:24:15.000000000 +1000
|
|
+++ unix/Makefile.in
|
|
@@ -87,7 +87,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
|
|
#CFLAGS = $(CFLAGS_DEBUG)
|
|
#CFLAGS = $(CFLAGS_OPTIMIZE)
|
|
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
|
|
-CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@
|
|
+CFLAGS += @CFLAGS@ @CFLAGS_DEFAULT@
|
|
|
|
# Flags to pass to the linker
|
|
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
|
|
@@ -169,8 +169,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
|
|
|
|
@@ -187,8 +187,8 @@ TCL_EXE = tclsh
|
|
# configure script. You shouldn't normally need to modify any of
|
|
# these definitions by hand.
|
|
|
|
-STLIB_LD = @STLIB_LD@
|
|
-SHLIB_LD = @SHLIB_LD@
|
|
+STLIB_LD = ${AR} cr
|
|
+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
|
|
SHLIB_CFLAGS = @SHLIB_CFLAGS@
|
|
|
|
SHLIB_SUFFIX = @SHLIB_SUFFIX@
|
|
@@ -235,8 +235,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@ ${LDFLAGS}
|
|
|
|
#----------------------------------------------------------------
|
|
# The information below should be usable as is. The configure
|
|
@@ -420,6 +421,7 @@ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE
|
|
@MAKE_LIB@
|
|
if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
|
|
$(RANLIB) ${TCL_LIB_FILE}; \
|
|
+ $(TOUCH) ${TCL_LIB_FILE}; \
|
|
fi
|
|
|
|
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
|
@@ -440,11 +442,11 @@ objs: ${OBJS}
|
|
|
|
|
|
tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
|
|
- ${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
|
|
+ ${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
|
|
@TCL_LD_SEARCH_FLAGS@ -o tclsh
|
|
|
|
tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
|
|
- ${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
|
|
+ ${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
|
|
@TCL_LD_SEARCH_FLAGS@ -o tcltest
|
|
|
|
# Note, in the target below TCL_LIBRARY needs to be set or else
|
|
@@ -538,7 +540,7 @@ install-binaries: binaries
|
|
chmod +x $(SRC_DIR)/install-sh; \
|
|
fi
|
|
@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
|
|
- @$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
|
|
+ @$(INSTALL_LIBRARY) $(TCL_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
|
|
@if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
|
|
(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \
|
|
fi
|
|
@@ -989,7 +991,7 @@ tclUnixInit.o: $(UNIX_DIR)/tclUnixInit.c
|
|
|
|
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} \
|
|
@TCL_LD_SEARCH_FLAGS@ -L/usr/openwin/lib -lXt -o xttest
|
|
|