diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-05-28 12:28:48 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-05-28 12:28:48 (GMT) |
| commit | 256df5a086b18e57f87787a7e23389d8d8e308cd (patch) | |
| tree | ac7ffa170dce515578565a129d658d5d6a613fbe /unix/tcl.m4 | |
| parent | 24fdf2893b2456dba53e49f20fc54769fa6cbc0c (diff) | |
| parent | 32461a99d3dc5741caf2f1c282ca57fe06220b79 (diff) | |
| download | tcl-256df5a086b18e57f87787a7e23389d8d8e308cd.zip tcl-256df5a086b18e57f87787a7e23389d8d8e308cd.tar.gz tcl-256df5a086b18e57f87787a7e23389d8d8e308cd.tar.bz2 | |
merge trunktested
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 3ffdcd4..d896d05 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -2102,21 +2102,19 @@ dnl # preprocessing tests use only CPPFLAGS. AS_IF([test "$RANLIB" = ""], [ MAKE_LIB='$(STLIB_LD) [$]@ ${OBJS}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' ], [ MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ; ${RANLIB} [$]@' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))' ]) + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' ]) # Stub lib does not depend on shared/static configuration AS_IF([test "$RANLIB" = ""], [ MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS}' - INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' ], [ MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@' - INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' ]) + INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' # Define TCL_LIBS now that we know what DL_LIBS is. # The trick here is that we don't want to change the value of TCL_LIBS if |