diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-27 19:24:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-27 19:24:26 (GMT) |
| commit | 59051e407213c7a42b2427b17338c30336b82845 (patch) | |
| tree | 637aa2b4336d43407bc0a9e6be0483598050a272 | |
| parent | 4690135e8bcf136cabe21150ca07278d98ef9f9c (diff) | |
| parent | 022dcdf1391c87fa59c87ed6efb740f84b4ae95d (diff) | |
| download | tk-59051e407213c7a42b2427b17338c30336b82845.zip tk-59051e407213c7a42b2427b17338c30336b82845.tar.gz tk-59051e407213c7a42b2427b17338c30336b82845.tar.bz2 | |
merge
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/configure.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure index 9af1a4c..ca35f30 100755 --- a/unix/configure +++ b/unix/configure @@ -11153,7 +11153,7 @@ echo "${ECHO_T}static library" >&6 fi TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version ${TK_VERSION}`echo ${TK_PATCH_LEVEL} | awk '{match($0, "\\\.[0-9]+"); print substr($0,RSTART,RLENGTH)}'`" - TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name "${DYLIB_INSTALL_DIR}"/${TK_LIB_FILE}' + TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name "${DYLIB_INSTALL_DIR}/${TK_LIB_FILE}"' if test $tk_aqua = yes; then TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -unexported_symbols_list $$(f=$(TK_LIB_FILE).E && nm -gp tkMacOSX*.o 2>/dev/null | awk "/^[0-9a-f]+ . \.objc/ {print \$$3}" > $$f && echo $$f)' fi diff --git a/unix/configure.in b/unix/configure.in index 64a32fa..0b519a6 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -640,7 +640,7 @@ WISH_RSRC_FILE='wish$(VERSION).rsrc' if test "`uname -s`" = "Darwin" ; then SC_ENABLE_FRAMEWORK TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version ${TK_VERSION}`echo ${TK_PATCH_LEVEL} | awk ['{match($0, "\\\.[0-9]+"); print substr($0,RSTART,RLENGTH)}']`" - TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name "${DYLIB_INSTALL_DIR}"/${TK_LIB_FILE}' + TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name "${DYLIB_INSTALL_DIR}/${TK_LIB_FILE}"' if test $tk_aqua = yes; then TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -unexported_symbols_list $$(f=$(TK_LIB_FILE).E && nm -gp tkMacOSX*.o 2>/dev/null | awk "/^[[0-9a-f]]+ . \.objc/ {print \$$3}" > $$f && echo $$f)' fi |