X-Git-Url: http://git.pld-linux.org/?p=packages%2Fakode.git;a=blobdiff_plain;f=kde-common-PLD.patch;h=2cb771ab1a541bdce2cbff0f40c18854a14ff4c7;hp=2664ad8c1268f9396150e5e0cb66c7653693df5e;hb=refs%2Ftags%2Fauto%2Fac%2Fkdeadmin-3_5_8-1;hpb=369f6a9693d37a79170b5fabaff7195c3137fb5c

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 2664ad8..2cb771a 100644
--- a/kde-common-PLD.patch
+++ b/kde-common-PLD.patch
@@ -118,21 +118,25 @@
  AC_MSG_RESULT($QTDOCDIR)
  
  AC_SUBST(QTDOCDIR)
---- kdelibs-3.5.4/admin/am_edit	2006-07-24 10:18:33.000000000 +0300
-+++ gwenview-1.4.0/admin/am_edit	2006-09-25 00:04:55.213036950 +0300
-@@ -499,6 +499,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\) --mode=link --tag=CXX) \$\(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(.*)';
-@@ -578,6 +583,14 @@
+@@ -578,6 +587,14 @@
          local @kde_options = split(/[\034\s]+/, $kde_options_str);
          if (grep(/^foreign$/, @kde_options)) {
              push(@foreignfiles, $makefileDir . "/");