Check-in [97b136826e]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Updated to allow a specified prefix to override the detected Tcl package path
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:97b136826e1e01c65c5ee8ffc317895b351dbc72
User & Date: rkeene 2016-12-13 17:14:36
Context
2016-12-13
17:29
Made the "test" target more useful when doing out-of-source-dir builds check-in: de649c9c44 user: rkeene tags: trunk
17:15
Merged in trunk check-in: 6aff73e57a user: rkeene tags: tls-1-7
17:14
Updated to allow a specified prefix to override the detected Tcl package path check-in: 97b136826e user: rkeene tags: trunk
16:48
Updated to latest remote shobj.m4 check-in: 4ab0af9e58 user: rkeene tags: trunk
Changes

Changes to Makefile.in.

     3      3   RANLIB = @RANLIB@
     4      4   CFLAGS = @CFLAGS@ @SHOBJFLAGS@
     5      5   CPPFLAGS = @CPPFLAGS@ -I@srcdir@ -I. @DEFS@ @TCL_DEFS@
     6      6   LDFLAGS = @LDFLAGS@ @SHOBJLDFLAGS@
     7      7   LIBS = @LIBS@
     8      8   INSTALL = @INSTALL@
     9      9   PACKAGE_VERSION = @PACKAGE_VERSION@
           10  +prefix = @prefix@
           11  +exec_prefix = @exec_prefix@
           12  +libdir = @libdir@
    10     13   TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
    11     14   PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tcltls$(PACKAGE_VERSION)
    12     15   VPATH = @srcdir@
    13     16   
    14     17   all: @EXTENSION_TARGET@
    15     18   
    16     19   # The shared object target

Changes to aclocal/tcl.m4.

   152    152   			esac
   153    153   		done
   154    154   	)`
   155    155   	TCL_DEFS="${TCL_DEFS_TCL_ONLY}"
   156    156   	AC_SUBST(TCL_DEFS)
   157    157   
   158    158   	dnl Needed for package installation
   159         -	TCL_PACKAGE_PATH="`echo "${TCL_PACKAGE_PATH}" | sed 's@  *$''@@' | awk '{ print [$]1 }'`"
          159  +	if test "$prefix" = 'NONE' -a "$exec_prefix" = 'NONE' -a "${libdir}" = '${exec_prefix}/lib'; then
          160  +		TCL_PACKAGE_PATH="`echo "${TCL_PACKAGE_PATH}" | sed 's@  *$''@@' | awk '{ print [$]1 }'`"
          161  +	else
          162  +		TCL_PACKAGE_PATH='${libdir}'
          163  +	fi
   160    164   	AC_SUBST(TCL_PACKAGE_PATH)
   161    165   
   162    166   	AC_SUBST(LIBS)
   163    167   ])