]>
Commit | Line | Data |
---|---|---|
d7d19126 ER |
1 | --- gwenview-1.4.0/admin/am_edit 2006-09-25 00:04:55.213036950 +0300 |
2 | +++ kdelibs-3.5.5/admin/am_edit 2006-10-03 11:40:08.052152886 +0300 | |
3 | @@ -499,6 +499,15 @@ | |
4 | } | |
5 | } | |
6 | ||
7 | + $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)'; | |
8 | + if ($MakefileData =~ m/$lookup/) { | |
9 | + substituteLine($lookup, "$1 \"\$\(CXXLD\)\""); | |
10 | + } | |
11 | + $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)'; | |
12 | + if ($MakefileData =~ m/$lookup/) { | |
13 | + substituteLine($lookup, "$1 \"\$\(CCLD\)\""); | |
14 | + } | |
15 | + | |
16 | $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g; | |
17 | ||
18 | $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)'; | |
19 | @@ -578,6 +587,14 @@ | |
20 | local @kde_options = split(/[\034\s]+/, $kde_options_str); | |
21 | if (grep(/^foreign$/, @kde_options)) { | |
22 | push(@foreignfiles, $makefileDir . "/"); | |
23 | + | |
24 | + # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument. | |
25 | + $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)'; | |
26 | + if ($MakefileData =~ m/$lookup/) { | |
27 | + substituteLine($lookup, "$1 \"\$\(CXXLD\)\""); | |
28 | + updateMakefile (); | |
29 | + } | |
30 | + | |
31 | return 0; # don't touch me | |
32 | } | |
33 | for $opt (@kde_options) { |