X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kde-common-PLD.patch;h=2cb771ab1a541bdce2cbff0f40c18854a14ff4c7;hb=refs%2Ftags%2Fauto%2Fac%2Fkdevelop-3_5_0-1;hp=365f83fd48cbf40eb3a5377b89b806782c1ee5c8;hpb=13764517f92ba2ab13c269ab8a9204113556c7c9;p=packages%2Fakode.git

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 365f83f..2cb771a 100644
--- a/kde-common-PLD.patch
+++ b/kde-common-PLD.patch
@@ -118,21 +118,25 @@
  AC_MSG_RESULT($QTDOCDIR)
  
  AC_SUBST(QTDOCDIR)
---- kdepim-3.5.4/admin/am_edit	2006-09-19 14:20:21.446444147 +0300
-+++ kdepim-3.5.4/admin/am_edit	2006-09-20 00:14:49.967386769 +0300
-@@ -498,6 +498,11 @@
+--- gwenview-1.4.0/admin/am_edit	2006-09-25 00:04:55.213036950 +0300
++++ kdelibs-3.5.5/admin/am_edit	2006-10-03 11:40:08.052152886 +0300
+@@ -499,6 +499,15 @@
          }
      }
  
-+    $lookup = '(CXXLINK = \$\(LIBTOOL\) --tag=CXX --mode=link) \$\(CXXLD\)';
++    $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
 +    if ($MakefileData =~ m/$lookup/) {
 +        substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
 +    }
++    $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
++    if ($MakefileData =~ m/$lookup/) {
++        substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
++    }
 +
      $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
  
      $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
-@@ -573,6 +578,14 @@
+@@ -578,6 +587,14 @@
          local @kde_options = split(/[\034\s]+/, $kde_options_str);
          if (grep(/^foreign$/, @kde_options)) {
              push(@foreignfiles, $makefileDir . "/");