changeset 22484:9e90abc3718e

maint: Merge away accidental head.
author Rik <rik@octave.org>
date Wed, 14 Sep 2016 10:54:53 -0700
parents ea8d53084b06 (current diff) 541a20a4961c (diff)
children 8607bdc16206
files
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/mkoctfile.in.cc	Wed Sep 14 10:53:45 2016 -0700
+++ b/src/mkoctfile.in.cc	Wed Sep 14 10:54:53 2016 -0700
@@ -312,7 +312,8 @@
 "\n"
 "  -s, --strip             Strip output file.\n"
 "\n"
-"  -n, --just-print        Print commands, but do not execute them.\n"
+"  -n, --just-print, --dry-run\n"
+"      Print commands, but do not execute them.\n"
 "\n"
 "  -v, --verbose           Echo commands as they are executed.\n"
 "\n"
@@ -536,7 +537,7 @@
           else
             std::cerr << "mkoctfile: output filename missing" << std::endl;
         }
-      else if (arg == "-n" || arg == "--just-print")
+      else if (arg == "-n" || arg == "--dry-run" || arg == "--just-print")
         {
           printonly = true;
         }