Index: /trunk/source/lisp-kernel/pmcl-kernel.c
===================================================================
--- /trunk/source/lisp-kernel/pmcl-kernel.c	(revision 15158)
+++ /trunk/source/lisp-kernel/pmcl-kernel.c	(revision 15159)
@@ -1089,5 +1089,7 @@
   }
   fprintf(dbgout, "usage: %s <options>\n", program_name);
+#ifdef SINGLE_ARG_SHORTHAND
   fprintf(dbgout, "\t or %s <image-name>\n", program_name);
+#endif
   fprintf(dbgout, "\t where <options> are one or more of:\n");
   if (other_args && *other_args) {
@@ -1895,4 +1897,5 @@
 
   program_name = argv[0];
+#ifdef SINGLE_ARG_SHORTHAND
   if ((argc == 2) && (*argv[1] != '-')) {
 #ifdef WINDOWS
@@ -1906,6 +1909,9 @@
 #endif
   } else {
+#endif  /* SINGLE_ARG_SHORTHAND */
     process_options(argc,argv,utf_16_argv);
-  }
+#ifdef SINGLE_ARG_SHORTHAND
+  }
+#endif
   if (lisp_heap_gc_threshold != DEFAULT_LISP_HEAP_GC_THRESHOLD) {
     lisp_heap_threshold_set_from_command_line = true;