merged unix and windows styles

1 files changed, 26 insertions, 32 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index d716aff..b7790d4 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,11 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.31 1999/06/15 20:44:36 wart Exp $
-
-# PURIFY =
-
-# Current Tcl version;  used in various names.
+# RCS: @(#) $Id: Makefile.in,v 1.32 1999/06/16 22:36:23 surles Exp $
 
 VERSION 		= @TCL_VERSION@
 
@@ -36,42 +32,40 @@ exec_prefix		= @exec_prefix@
 # when installing files.
 INSTALL_ROOT		=
 
-# Directory from which applications will reference the library of Tcl
-# scripts (note: you can set the TCL_LIBRARY environment variable at
-# run-time to override this value):
-TCL_LIBRARY		= $(prefix)/lib/tcl$(VERSION)
-
-# Package search path.
-TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
+# Path to use at runtime to refer to LIB_INSTALL_DIR:
+LIB_RUNTIME_DIR = $(exec_prefix)/lib
 
-# Path name to use when installing library scripts:
-SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
+# Directory in which to install the program tclsh:
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
 
 # Directory in which to install libtcl.so or libtcl.a:
-LIB_INSTALL_DIR		= $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
 
-# Path to use at runtime to refer to LIB_INSTALL_DIR:
-LIB_RUNTIME_DIR		= $(exec_prefix)/lib
-
-# Directory in which to install the program tclsh:
-BIN_INSTALL_DIR		= $(INSTALL_ROOT)$(exec_prefix)/bin
+# 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)$(prefix)/include
 
 # Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR		= $(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
 
 # Directory in which to install manual entry for tclsh:
-MAN1_INSTALL_DIR	= $(MAN_INSTALL_DIR)/man1
+MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
 
 # Directory in which to install manual entries for Tcl's C library
 # procedures:
-MAN3_INSTALL_DIR	= $(MAN_INSTALL_DIR)/man3
+MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3
 
 # Directory in which to install manual entries for the built-in
 # Tcl commands:
-MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/mann
+MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
+
+# Directory in which to install the include file tcl.h:
+INCLUDE_INSTALL_DIR = @includedir@
+
+# Package search path.
+TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
 
 # Libraries built with optimization switches have this additional extension
 TCL_DBGX		= @TCL_DBGX@
@@ -388,7 +382,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS)
 
 all: binaries libraries doc
 
-binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh
+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
 
 libraries:
 
@@ -419,11 +413,11 @@ objs: ${OBJS}
 
 
 tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
-	${CC} @LD_FLAGS@ ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+	${CC} @LDFLAGS@ ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 		@TCL_LD_SEARCH_FLAGS@ -o tclsh
 
 tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
-	${CC} @LD_FLAGS@ ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+	${CC} @LDFLAGS@ ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 		@TCL_LD_SEARCH_FLAGS@ -o tcltest
 
 
@@ -487,13 +481,13 @@ dltest/Makefile: $(DLTEST_DIR)/configure $(DLTEST_DIR)/Makefile.in tclConfig.sh
 	cd dltest; if test -f configure; then ./configure; else \
 	    $(DLTEST_DIR)/configure; fi
 
-install: install-binaries install-libraries install-man
+install: all install-binaries install-libraries install-man
 
 # Note: before running ranlib below, must cd to target directory because
 # some ranlibs write to current directory, and this might not always be
 # possible (e.g. if installing as root).
 
-install-binaries: binaries $(TCL_BUILD_EXP_FILE)
+install-binaries: 
 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
@@ -522,7 +516,7 @@ install-binaries: binaries $(TCL_BUILD_EXP_FILE)
 			 $(LIB_INSTALL_DIR)/$(TCL_STUB_LIB_FILE); \
 	    fi
 
-install-libraries: libraries
+install-libraries:
 	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
 		$(SCRIPT_INSTALL_DIR); \
 	    do \
@@ -565,7 +559,7 @@ install-libraries: libraries
 		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/encoding; \
 	done;
 
-install-man: man
+install-doc:
 	@chmod +x $(UNIX_DIR)/mkLinks
 	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
 	    do \