updated to 8.5.13.

[packages/tk.git] / tk-norpath.patch

diff --git a/tk-norpath.patch b/tk-norpath.patch
index 1578f9588fed8336fdde512a6690166c78cdd003..f0005badf128302019dd574ce4a6d0ec8021883d 100644 (file)
--- a/tk-norpath.patch
+++ b/tk-norpath.patch
@@ -1,4 +1,3 @@
-diff -urN tk8.5a3.org/unix/Makefile.in tk8.5a3/unix/Makefile.in
 --- tk8.5a3.org/unix/Makefile.in       2005-06-04 23:00:25.000000000 +0200
 +++ tk8.5a3/unix/Makefile.in   2005-06-17 23:57:52.837126312 +0200
 @@ -262,8 +262,8 @@
@@ -13,15 +12,14 @@ diff -urN tk8.5a3.org/unix/Makefile.in tk8.5a3/unix/Makefile.in
  # support for embedded libraries on Darwin / Mac OS X
  DYLIB_INSTALL_DIR     = ${LIB_RUNTIME_DIR}
 
-diff -urN tk8.5a3.org/unix/tcl.m4 tk8.5a3/unix/tcl.m4
---- tk8.5a3.org/unix/tcl.m4    2005-06-04 23:07:14.000000000 +0200
-+++ tk8.5a3/unix/tcl.m4        2005-06-17 23:44:37.081099616 +0200
-@@ -2042,7 +2042,7 @@
+--- tk8.5.13/unix/tcl.m4.orig  2012-11-28 21:37:18.227295408 +0100
++++ tk8.5.13/unix/tcl.m4       2012-11-28 21:38:22.233962299 +0100
+@@ -2103,7 +2103,7 @@
  
      AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
 -        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
 +        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}'
-         INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
-     ], [
-         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
+         AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
+             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
+             DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"