summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-02-18 20:30:28 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-18 20:30:28 +0100
commit8918209f54f22935aa67a92dfea78b9a1623361b (patch)
tree80cc3b6d06a6a53860c1f83f23ffbd706886109e
parent50c595422f05af2f2e1457ee3d27f8e5ce1ab35d (diff)
downloadadmin-8918209f54f22935aa67a92dfea78b9a1623361b.tar.gz
admin-8918209f54f22935aa67a92dfea78b9a1623361b.zip
Fix unintended rename of workfiles
-rw-r--r--am_edit20
1 files changed, 10 insertions, 10 deletions
diff --git a/am_edit b/am_edit
index 97e7aec..c15adba 100644
--- a/am_edit
+++ b/am_edit
@@ -395,21 +395,21 @@ sub processMakefile ($)
if ($MakefileData =~ /\n$lookup/) {
my $condition = $1;
my $depfiles = $2;
- my $wortdefiles;
+ my $workfiles;
if ($dep_finals) {
# Add the conditions on every line, since
# there may be line continuations in the list.
- $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";
+ $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";
} else {
- $wortdefiles = "$dep_files $depfiles";
- $wortdefiles =~ s/\034/\034$condition\t/g;
- $lines = $condition . "DEP_FILES = $wortdefiles";
+ $workfiles = "$dep_files $depfiles";
+ $workfiles =~ s/\034/\034$condition\t/g;
+ $lines = $condition . "DEP_FILES = $workfiles";
}
substituteLine($lookup, $lines);
}