Check-in [97b136826e]
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 on 2016-12-13 17:14:36
Other Links: manifest | tags
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
1
2
3
4
5
6
7
8
9



10
11
12
13
14
15
16
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19









+
+
+







CC = @CC@
AR = @AR@
RANLIB = @RANLIB@
CFLAGS = @CFLAGS@ @SHOBJFLAGS@
CPPFLAGS = @CPPFLAGS@ -I@srcdir@ -I. @DEFS@ @TCL_DEFS@
LDFLAGS = @LDFLAGS@ @SHOBJLDFLAGS@
LIBS = @LIBS@
INSTALL = @INSTALL@
PACKAGE_VERSION = @PACKAGE_VERSION@
prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tcltls$(PACKAGE_VERSION)
VPATH = @srcdir@

all: @EXTENSION_TARGET@

# The shared object target
152
153
154
155
156
157
158

159




160
161
162
163
152
153
154
155
156
157
158
159

160
161
162
163
164
165
166
167







+
-
+
+
+
+




			esac
		done
	)`
	TCL_DEFS="${TCL_DEFS_TCL_ONLY}"
	AC_SUBST(TCL_DEFS)

	dnl Needed for package installation
	if test "$prefix" = 'NONE' -a "$exec_prefix" = 'NONE' -a "${libdir}" = '${exec_prefix}/lib'; then
	TCL_PACKAGE_PATH="`echo "${TCL_PACKAGE_PATH}" | sed 's@  *$''@@' | awk '{ print [$]1 }'`"
		TCL_PACKAGE_PATH="`echo "${TCL_PACKAGE_PATH}" | sed 's@  *$''@@' | awk '{ print [$]1 }'`"
	else
		TCL_PACKAGE_PATH='${libdir}'
	fi
	AC_SUBST(TCL_PACKAGE_PATH)

	AC_SUBST(LIBS)
])