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

List:       kde-commits
Subject:    kde-common/admin
From:       Dirk Mueller <mueller () kde ! org>
Date:       2005-03-01 18:43:12
Message-ID: 20050301184312.B0609157B9 () 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


  M +3 -2      am_edit   1.414


--- kde-common/admin/am_edit  #1.413:1.414
@@ -352,5 +352,5 @@
     $tmp   .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
     appendLines($tmp);
-    
+
     make_bcheck_target();
     make_meta_classes();
@@ -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]