From 95416ace6be3973d3b447f0cd81ab4563e2f4d48 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 3 Oct 2006 10:43:21 +0000 Subject: [PATCH] - also adjust LINK for quotes Changed files: kde-common-PLD.patch -> 1.10 --- kde-common-PLD.patch | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 . "/"); -- 2.43.0