[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_4_BRANCH: kde-common/admin
From:       Dirk Mueller <mueller () kde ! org>
Date:       2005-03-01 18:46:09
Message-ID: 20050301184609.C132016EF1 () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

don't substitute the same line again, causes longstanding ugly problems with bcheck \
target (backport revision 1.414)


  M +2 -1      am_edit   1.412.6.2


--- kde-common/admin/am_edit  #1.412.6.1:1.412.6.2
@@ -484,4 +484,5 @@
             $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
             $replacement = "$stuff_before\$(KCXXFLAGS) \
\$(KDE_CXXFLAGS)$stuff_after"; +            next if ($stuff_before =~ \
/\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);  \
substituteLine($lookup, $replacement);  } else {


[prev in list] [next in list] [prev in thread] [next in thread]