summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2002-07-23 17:30:05 (GMT)
committermdejong <mdejong>2002-07-23 17:30:05 (GMT)
commitd45bebfe57cee2e24f8ebae9243d05caf4244ce3 (patch)
tree58f22c4fb80ffd64bfff22078d3e775c839c0d09
parentff2303e56665cf56fbe9eb41a11bbf04df2556af (diff)
downloadtcl-d45bebfe57cee2e24f8ebae9243d05caf4244ce3.zip
tcl-d45bebfe57cee2e24f8ebae9243d05caf4244ce3.tar.gz
tcl-d45bebfe57cee2e24f8ebae9243d05caf4244ce3.tar.bz2
* unix/Makefile.in: Combine ranlib tests and
avoid printing unless ranlib is actually run.
-rw-r--r--ChangeLog5
-rw-r--r--unix/Makefile.in11
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index dadf3bd..524b77c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-07-23 Mo DeJong <mdejong@users.sourceforge.net>
+ * unix/Makefile.in: Combine ranlib tests and
+ avoid printing unless ranlib is actually run.
+
+2002-07-23 Mo DeJong <mdejong@users.sourceforge.net>
+
* unix/tcl.m4 (SC_PATH_X): Set XINCLUDES to "" instead
of "# no special path needed" or "# no include files found"
when x headers cannot be located.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 92b6922..fbca974 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.108 2002/07/19 15:15:51 vincentdarley Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.109 2002/07/23 17:30:06 mdejong Exp $
VERSION = @TCL_VERSION@
@@ -433,11 +433,10 @@ doc:
${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f ${TCL_LIB_FILE}
@MAKE_LIB@
- if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
- $(RANLIB) ${TCL_LIB_FILE}; \
- fi
- if test "x@DL_OBJS@" = "xtclLoadDyld.o"; then \
- $(RANLIB) ${TCL_LIB_FILE}; \
+ @if test "x@DL_OBJS@" = "xtclLoadAout.o" || \
+ test "x@DL_OBJS@" = "xtclLoadDyld.o" ; then \
+ echo "$(RANLIB) ${TCL_LIB_FILE}"; \
+ $(RANLIB) ${TCL_LIB_FILE}; \
fi
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}