From c115658ffcb8c6bab7d04d56a66b18ee1ea5121a Mon Sep 17 00:00:00 2001 From: kseitz Date: Thu, 10 Jan 2002 20:17:57 +0000 Subject: [PATCH] * unix/Makefile.in (TCL_RANLIB): Renamed from just "RANLIB". Changed all references to "RANLIB" to "TCL_RANLIB" so that toplevel Makefile doesn't override our own settings. --- tcl/unix/ChangeLog | 6 ++++++ tcl/unix/Makefile.in | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tcl/unix/ChangeLog b/tcl/unix/ChangeLog index a7c8e511aa..8037911c30 100644 --- a/tcl/unix/ChangeLog +++ b/tcl/unix/ChangeLog @@ -1,3 +1,9 @@ +2002-01-10 Keith Seitz + + * unix/Makefile.in (TCL_RANLIB): Renamed from just "RANLIB". + Changed all references to "RANLIB" to "TCL_RANLIB" so that + toplevel Makefile doesn't override our own settings. + 2001-09-18 Ian Roxborough * Makefile.in: Added TCL_CFLAGS for flags that diff --git a/tcl/unix/Makefile.in b/tcl/unix/Makefile.in index fa8ec8eed2..8e6b3224de 100644 --- a/tcl/unix/Makefile.in +++ b/tcl/unix/Makefile.in @@ -243,7 +243,7 @@ COMPAT_OBJS = @LIBOBJS@ AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ AR = @AR@ -RANLIB = @RANLIB@ +TCL_RANLIB = @RANLIB@ SRC_DIR = @srcdir@ TOP_DIR = @srcdir@/.. GENERIC_DIR = $(TOP_DIR)/generic @@ -438,12 +438,12 @@ doc: ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ - $(RANLIB) ${TCL_LIB_FILE} + $(TCL_RANLIB) ${TCL_LIB_FILE} ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ - $(RANLIB) ${STUB_LIB_FILE} + $(TCL_RANLIB) ${STUB_LIB_FILE} # Make target which outputs the list of the .o contained in the Tcl lib # usefull to build a single big shared library containing Tcl and other @@ -554,7 +554,7 @@ install-binaries: binaries fi @echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/" @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) + @(cd $(LIB_INSTALL_DIR); $(TCL_RANLIB) $(TCL_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ -- 2.11.0