diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2009-01-20 03:54:35 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2009-01-20 03:54:35 (GMT) |
| commit | 22ce7af7758444030a12394242057ab031c2c739 (patch) | |
| tree | a6a92a5be994eeca4d64fdbfc3a93c96049ac38c /unix/Makefile.in | |
| parent | 93e5e125ba5052feeefa268b542cad1619074788 (diff) | |
| download | tcl-22ce7af7758444030a12394242057ab031c2c739.zip tcl-22ce7af7758444030a12394242057ab031c2c739.tar.gz tcl-22ce7af7758444030a12394242057ab031c2c739.tar.bz2 | |
Backport of Patch 907924
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index e698cb1..84ad721 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.229.2.10 2008/11/10 17:57:10 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.229.2.11 2009/01/20 03:54:35 kennykb Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -80,6 +80,9 @@ HTML_DIR = @HTML_DIR@ # Directory in which to install html documentation: HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) +# Directory in which to install the configuration file tclConfig.sh +CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) + # Package search path. TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ @@ -711,7 +714,8 @@ install-strip: # (e.g. if installing as root). install-binaries: binaries - @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" ; \ + @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ + "$(CONFIG_INSTALL_DIR)"; \ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -733,8 +737,8 @@ install-binaries: binaries fi @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" @$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION) - @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) tclConfig.sh "$(LIB_INSTALL_DIR)"/tclConfig.sh + @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" + @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ @@ -773,7 +777,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs done; @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ - $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \ + $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ done; |