X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fgenmk95.pl;h=cf31457ab1047a504a3b3534e6faa2eceb0a39aa;hb=ef469b0369ad36d7b41ff4e3416ffb34105b3bef;hp=6137ce2be6b77e2399de40c8e18a9fcfa05898e6;hpb=1d7c184104c076988718a01b77c8706aae05b092;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/genmk95.pl b/win32/genmk95.pl
index 6137ce2..cf31457 100644
--- a/win32/genmk95.pl
+++ b/win32/genmk95.pl
@@ -45,9 +45,12 @@ while (<$in>)
        next;
     }
     else {
-       seek ($out, -3, 2);      # no recipe, so back up and undo grouping
+       if (!/^\t/) {
+           seek ($out, -4, 2);      # no recipe, so back up and undo grouping
+                                    # should be -3, but MS has its CR/LF thing...
+           $inrec = 0;
+       }
        print $out "$_\n";
-       $inrec = 0;
        next;
     }
  }
@@ -61,6 +64,7 @@ while (<$in>)
  if (/^(.*?)(&&|\|\|)(.*)$/)  # two commands separated by && or ||
  {
     my ($one, $sep, $two) = ($1, $2, $3);
+    $one =~ s/^\t(?:-(?!-))?\@?(.*?)$/\t$1/;   # no -,@ in group recipes
 LINE_CONT:
     if ($two =~ /\\\s*$/)
     {
@@ -74,6 +78,7 @@ LINE_CONT:
     next;
  }
      # fall through - no need for special handling
+ s/^\t(?:-(?!-))?\@?(.*?)$/\t$1/;      # no -,@ in group recipes
  print $out "$_\n";
 }
 print $out "]\n" if ($inrec);