diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 31 | ||||
| -rw-r--r-- | win/makefile.vc | 10 |
2 files changed, 21 insertions, 20 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 80d8f93..d03e9a9 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.32 2000/04/20 01:30:20 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.33 2000/04/25 20:58:48 hobbs Exp $ VERSION = @TCL_VERSION@ @@ -22,8 +22,12 @@ VERSION = @TCL_VERSION@ # at configure-time with the --exec-prefix and --prefix options # to the "configure" script. -prefix = @prefix@ -exec_prefix = @exec_prefix@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ +mandir = @mandir@ # The following definition can be set to non-null for special systems # like AFS with replication. It allows the pathnames used for installation @@ -38,22 +42,22 @@ INSTALL_ROOT = TCL_LIBRARY = $(prefix)/lib/tcl$(VERSION) # Path to use at runtime to refer to LIB_INSTALL_DIR: -LIB_RUNTIME_DIR = $(exec_prefix)/lib +LIB_RUNTIME_DIR = $(libdir) # Directory in which to install the program tclsh: -BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin +BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) # Directory in which to install libtcl.so or libtcl.a: -LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib +LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) -# Path name to use when installing library scripts: -SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) +# Path name to use when installing library scripts. +SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) # Directory in which to install the include file tcl.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include +INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) # Top-level directory in which to install manual entries: -MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man +MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) # Directory in which to install manual entry for tclsh: MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1 @@ -66,9 +70,6 @@ MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3 # Tcl commands: MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann -# Directory in which to install the include file tcl.h: -INCLUDE_INSTALL_DIR = @includedir@ - # Libraries built with optimization switches have this additional extension TCL_DBGX = @TCL_DBGX@ @@ -463,7 +464,7 @@ install-libraries: else true; \ fi; \ done; - @for i in http1.0 http2.1 opt0.4 encoding msgcat1.0 tcltest1.0; \ + @for i in http1.0 http2.3 opt0.4 encoding msgcat1.0 tcltest1.0; \ do \ if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ @@ -481,7 +482,7 @@ install-libraries: do \ $(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \ done; - @for i in http2.1 http1.0 opt0.4 msgcat1.0 tcltest1.0; \ + @for i in http2.3 http1.0 opt0.4 msgcat1.0 tcltest1.0; \ do \ echo "Installing library $$i directory"; \ for j in $(ROOT_DIR)/library/$$i/*.tcl; \ diff --git a/win/makefile.vc b/win/makefile.vc index 988e838..8fe5cda 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -6,7 +6,7 @@ # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-1999 by Scriptics Corporation. # -# RCS: @(#) $Id: makefile.vc,v 1.49 2000/02/10 02:54:33 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.50 2000/04/25 20:58:48 hobbs Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -367,10 +367,10 @@ install-libraries: -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0" -@copy "$(ROOT)\library\http1.0\http.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0" -@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0" - @echo installing http2.1 - -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.1" - -@copy "$(ROOT)\library\http2.1\http.tcl" "$(SCRIPT_INSTALL_DIR)\http2.1" - -@copy "$(ROOT)\library\http2.1\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.1" + @echo installing http2.3 + -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.3" + -@copy "$(ROOT)\library\http2.3\http.tcl" "$(SCRIPT_INSTALL_DIR)\http2.3" + -@copy "$(ROOT)\library\http2.3\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.3" @echo installing opt0.4 -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4" -@copy "$(ROOT)\library\opt0.4\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4" |