lang/tcl-itcl/patches/patch-ad

   1 $NetBSD: patch-ad,v 1.4 2010/02/11 13:44:02 joerg Exp $
   2
   3 --- itk/Makefile.in.orig        Tue Aug 29 03:58:00 2000
   4 +++ itk/Makefile.in
   5 @@ -103,7 +103,7 @@
   6
   7  SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@
   8
   9 -ITK_LIBRARY = $(prefix)/lib/itk$(VERSION)
  10 +ITK_LIBRARY = ${DESTDIR}$(prefix)/lib/tcl/itk$(VERSION)
  11
  12  ITK_GENERIC_DIR_NATIVE = @ITK_GENERIC_DIR_NATIVE@
  13  ITK_UNIX_DIR_NATIVE = @ITK_UNIX_DIR_NATIVE@
  14 @@ -138,16 +138,16 @@
  15  DESTDIR =
  16
  17  pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
  18 -pkglibdir = $(libdir)/@PACKAGE@@VERSION@
  19 +pkglibdir = ${DESTDIR}$(libdir)/tcl/@PACKAGE@@VERSION@
  20  pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
  21
  22  top_builddir = .
  23
  24  #INSTALL = $(top_srcdir)/../config/install-sh -c
  25 -INSTALL = $(TCLSH_PROG) `@CYGPATH@ $(top_srcdir)/../config/installFile.tcl` -c
  26 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
  27 -INSTALL_DATA = @INSTALL_DATA@
  28 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
  29 +INSTALL = ${LIBTOOL} --mode=install ${BSD_INSTALL}
  30 +INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
  31 +INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
  32 +INSTALL_SCRIPT = ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT}
  33  INSTALL_STRIP_FLAG =
  34  transform = @program_transform_name@
  35
  36 @@ -160,7 +160,7 @@
  37
  38  PACKAGE = @PACKAGE@
  39  VERSION = @VERSION@
  40 -CC = @CC@
  41 +CC = ${LIBTOOL} --mode=compile @CC@
  42  CFLAGS_DEBUG = @CFLAGS_DEBUG@
  43  CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
  44  CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
  45 @@ -175,9 +175,9 @@
  46  OBJEXT = @OBJEXT@
  47  RANLIB = @RANLIB@
  48  SHLIB_CFLAGS = @SHLIB_CFLAGS@
  49 -SHLIB_LD = @SHLIB_LD@
  50 +SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
  51  SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
  52 -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
  53 +SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk -ltcl -lX11 -lm
  54  STLIB_LD = @STLIB_LD@
  55  TCL_BIN_DIR = @TCL_BIN_DIR@
  56  TCL_DEFS = @TCL_DEFS@
  57 @@ -225,7 +225,7 @@
  58  AR = ar
  59  CFLAGS = @CFLAGS@
  60  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  61 -CCLD = $(CC)
  62 +CCLD = ${LIBTOOL} --mode=link @CC@
  63  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
  64
  65  #========================================================================
  66 @@ -314,12 +314,10 @@
  67  $(itk_LIB_FILE): $(itk_OBJECTS)
  68         -rm -f $(itk_LIB_FILE)
  69         @MAKE_LIB@
  70 -       $(RANLIB) $(itk_LIB_FILE)
  71
  72  $(itkstub_LIB_FILE): $(itkstub_OBJECTS)
  73         -rm -f $(itkstub_LIB_FILE)
  74         @MAKE_STATIC_LIB@
  75 -       $(RANLIB) $(itkstub_LIB_FILE)
  76
  77  #========================================================================
  78  # We need to enumerate the list of .c to .o lines here.
  79 @@ -394,7 +392,7 @@
  80  #========================================================================
  81
  82  install-lib-binaries: installdirs
  83 -       @list='$(lib_BINARIES)'; for p in $$list; do \
  84 +       @list='${itk_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \
  85           if test -f $$p; then \
  86             ext=`echo $$p|sed -e "s/.*\.//"`; \
  87             if test "x$$ext" = "xdll"; then \