cd0a43757f
in the all target. This prevents the libs from being created over and over. - fix up the libitk.so library so that the itk part of this package actually works.
69 lines
2.2 KiB
Text
69 lines
2.2 KiB
Text
$NetBSD: patch-ab,v 1.2 2004/09/25 06:43:04 dmcmahill Exp $
|
|
|
|
--- itcl/Makefile.in.orig Tue Aug 17 17:47:18 2004
|
|
+++ itcl/Makefile.in
|
|
@@ -58,7 +58,7 @@ PKG_HEADERS = @PKG_HEADERS@
|
|
PKG_LIB_FILE = @PKG_LIB_FILE@
|
|
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
|
|
|
|
-lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)
|
|
+lib_BINARIES = ${PKG_LIB_FILE:C/\.so.*/.la/} ${PKG_STUB_LIB_FILE}
|
|
BINARIES = $(lib_BINARIES)
|
|
|
|
SHELL = @SHELL@
|
|
@@ -77,19 +77,19 @@ DESTDIR =
|
|
|
|
PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
|
|
pkgdatadir = $(datadir)/$(PKG_DIR)
|
|
-pkglibdir = $(libdir)/$(PKG_DIR)
|
|
+pkglibdir = $(libdir)/tcl/$(PKG_DIR)
|
|
pkgincludedir = $(includedir)/$(PKG_DIR)
|
|
|
|
top_builddir = .
|
|
|
|
-INSTALL = @INSTALL@
|
|
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
-INSTALL_DATA = @INSTALL_DATA@
|
|
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
+INSTALL = ${LIBTOOL} --mode=install ${BSD_INSTALL}
|
|
+INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
|
|
+INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
|
|
+INSTALL_SCRIPT = ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT}
|
|
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
-CC = @CC@
|
|
+CC = ${LIBTOOL} --mode=compile @CC@
|
|
CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
|
|
CFLAGS_WARNING = @CFLAGS_WARNING@
|
|
CLEANFILES = @CLEANFILES@
|
|
@@ -103,9 +103,9 @@ OBJEXT = @OBJEXT@
|
|
RANLIB = @RANLIB@
|
|
RANLIB_STUB = @RANLIB_STUB@
|
|
SHLIB_CFLAGS = @SHLIB_CFLAGS@
|
|
-SHLIB_LD = @SHLIB_LD@
|
|
+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
|
|
SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@
|
|
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
|
+SHLIB_LD_LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltcl84 -lm
|
|
STLIB_LD = @STLIB_LD@
|
|
TCL_DEFS = @TCL_DEFS@
|
|
TCL_BIN_DIR = @TCL_BIN_DIR@
|
|
@@ -228,15 +228,13 @@ depend:
|
|
# source files above.
|
|
#========================================================================
|
|
|
|
-$(PKG_LIB_FILE): $(PKG_OBJECTS)
|
|
+${PKG_LIB_FILE:C/\.so.*/.la/}: $(PKG_OBJECTS)
|
|
-rm -f $(PKG_LIB_FILE)
|
|
${MAKE_LIB}
|
|
- $(RANLIB) $(PKG_LIB_FILE)
|
|
|
|
-$(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
|
|
+${PKG_STUB_LIB_FILE}: $(PKG_STUB_OBJECTS)
|
|
-rm -f $(PKG_STUB_LIB_FILE)
|
|
${MAKE_STUB_LIB}
|
|
- $(RANLIB_STUB) $(PKG_STUB_LIB_FILE)
|
|
|
|
#========================================================================
|
|
# We need to enumerate the list of .c to .o lines here.
|