summaryrefslogtreecommitdiffstats
path: root/unix/configure.in
diff options
context:
space:
mode:
authordas <das>2008-12-20 01:11:10 (GMT)
committerdas <das>2008-12-20 01:11:10 (GMT)
commita35311fd266c5c697d84b6756f65b208701578d7 (patch)
treea13a42ed49592ae786620463739148a1a34e10eb /unix/configure.in
parent6ea9bac1b2efe936f50571e3d5389f1f83c787a6 (diff)
downloadtcl-a35311fd266c5c697d84b6756f65b208701578d7.zip
tcl-a35311fd266c5c697d84b6756f65b208701578d7.tar.gz
tcl-a35311fd266c5c697d84b6756f65b208701578d7.tar.bz2
* unix/Makefile.in: make package install directory of bundled
* unix/configure.in packages configurable via PACKAGE_DIR makefile variable (set to platform-specific default). * unix/Makefile.in (*-packages): ensure toplevel targets fail if sub-make/configure fails; fix quoting when builddir path contains spaces. * macosx/GNUmakefile: add install-packages to install targets. * unix/configure: autoconf-2.59
Diffstat (limited to 'unix/configure.in')
-rw-r--r--unix/configure.in11
1 files changed, 10 insertions, 1 deletions
diff --git a/unix/configure.in b/unix/configure.in
index bc2a97c..6c694f6 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to
dnl generate the file "configure", which is run during Tcl installation
dnl to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.200 2008/12/19 10:55:38 dkf Exp $
+# RCS: @(#) $Id: configure.in,v 1.201 2008/12/20 01:11:10 das Exp $
AC_INIT([tcl],[8.6])
AC_PREREQ(2.59)
@@ -748,6 +748,12 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
unset n f v
], VERSION=${TCL_VERSION})
LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
+ # default install directory for bundled packages
+ if test "${libdir}" = '${exec_prefix}/lib' -o "`basename ${libdir}`" = 'Frameworks'; then
+ PACKAGE_DIR="/Library/Tcl"
+ else
+ PACKAGE_DIR="$libdir"
+ fi
if test "${libdir}" = '${exec_prefix}/lib'; then
# override libdir default
libdir="/Library/Frameworks"
@@ -774,6 +780,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
else
# libdir must be a fully qualified path and not ${exec_prefix}/lib
eval libdir="$libdir"
+ # default install directory for bundled packages
+ PACKAGE_DIR="$libdir"
if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
TCL_LIB_FLAG="-ltcl${TCL_VERSION}"
@@ -902,6 +910,7 @@ AC_SUBST(TCL_MODULE_PATH)
AC_SUBST(TCL_LIBRARY)
AC_SUBST(PRIVATE_INCLUDE_DIR)
AC_SUBST(HTML_DIR)
+AC_SUBST(PACKAGE_DIR)
AC_SUBST(EXTRA_CC_SWITCHES)
AC_SUBST(EXTRA_APP_CC_SWITCHES)