diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-05-20 15:12:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-05-20 15:12:50 (GMT) |
| commit | 9f4da271438f296f754e6469bc4510db736e7b7d (patch) | |
| tree | 4995531fc7af9da157e51b25d9bd12ceebb7a53b | |
| parent | 5b379ffc49f71a2c6bccd3f1a282bdbca3a1d0b7 (diff) | |
| download | tcl-9f4da271438f296f754e6469bc4510db736e7b7d.zip tcl-9f4da271438f296f754e6469bc4510db736e7b7d.tar.gz tcl-9f4da271438f296f754e6469bc4510db736e7b7d.tar.bz2 | |
[29044ba23f] Remove RANLIB as part of library installation. At best it's
redundant to the RANLIB already done as part of library build. At worst, it
conflicts with needs of cross-compiling. Thanks Erik Leunissen.
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rwxr-xr-x | unix/configure | 3 | ||||
| -rw-r--r-- | unix/tcl.m4 | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 958e759..18c90fa 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -783,10 +783,6 @@ install-strip: INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \ INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}" -# 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 @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ "$(CONFIG_INSTALL_DIR)"; \ diff --git a/unix/configure b/unix/configure index cb46f8d..a7a0bec 100755 --- a/unix/configure +++ b/unix/configure @@ -8856,15 +8856,14 @@ else if test "$RANLIB" = ""; then MAKE_LIB='$(STLIB_LD) $@ ${OBJS}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' else MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))' fi + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' fi diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 25c2699..a6f4241 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -2060,11 +2060,10 @@ 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 |