diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:44 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:44 -0600 |
commit | b6d5b675493a44e3e789cc914da0d18914d2bb39 (patch) | |
tree | 26ac0919421350e5b155508ed4be1e41464ff5fa /am_edit | |
parent | 38cacb89dda0605c17b203fa3a646b7f6469fd5c (diff) | |
download | admin-b6d5b675493a44e3e789cc914da0d18914d2bb39.tar.gz admin-b6d5b675493a44e3e789cc914da0d18914d2bb39.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'am_edit')
-rw-r--r-- | am_edit | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -395,21 +395,21 @@ sub processMakefile ($) if ($MakefileData =~ /\n$lookup/) { my $condition = $1; my $depfiles = $2; - my $workfiles; + my $wortdefiles; if ($dep_finals) { # Add the conditions on every line, since # there may be line continuations in the list. - $workfiles = "$dep_files $dep_finals $depfiles"; - $workfiles =~ s/\034/\034$condition\@KDE_USE_FINAL_TRUE\@\t/g; - $lines = "$condition\@KDE_USE_FINAL_TRUE\@DEP_FILES = $workfiles\n"; - $workfiles = "$dep_files $depfiles"; - $workfiles =~ s/\034/\034$condition\@KDE_USE_FINAL_FALSE\@\t/g; - $lines .= "$condition\@KDE_USE_FINAL_FALSE\@DEP_FILES = $workfiles"; + $wortdefiles = "$dep_files $dep_finals $depfiles"; + $wortdefiles =~ s/\034/\034$condition\@KDE_USE_FINAL_TRUE\@\t/g; + $lines = "$condition\@KDE_USE_FINAL_TRUE\@DEP_FILES = $wortdefiles\n"; + $wortdefiles = "$dep_files $depfiles"; + $wortdefiles =~ s/\034/\034$condition\@KDE_USE_FINAL_FALSE\@\t/g; + $lines .= "$condition\@KDE_USE_FINAL_FALSE\@DEP_FILES = $wortdefiles"; } else { - $workfiles = "$dep_files $depfiles"; - $workfiles =~ s/\034/\034$condition\t/g; - $lines = $condition . "DEP_FILES = $workfiles"; + $wortdefiles = "$dep_files $depfiles"; + $wortdefiles =~ s/\034/\034$condition\t/g; + $lines = $condition . "DEP_FILES = $wortdefiles"; } substituteLine($lookup, $lines); } |