(main): Fix having macros in a printf statement.

lib-src/emacsclient.c

@@ -438,13 +438,13 @@ To start the server in Emacs, type \"M-x server-start\".\n",
   if (cwd == 0)
     {
       /* getwd puts message in STRING if it fails.  */
-      fprintf (stderr, "%s: %s (%s)\n", argv[0],
+
 #ifdef HAVE_GETCWD
-	       "Cannot get current working directory",
+      fprintf (stderr, "%s: %s (%s)\n", argv[0],
+	       "Cannot get current working directory", strerror (errno));
 #else
-	       string,
+      fprintf (stderr, "%s: %s (%s)\n", argv[0], string, strerror (errno));
 #endif
-	       strerror (errno));
       fail (argc, argv);
     }
 

lib-src/movemail.c

@@ -228,13 +228,12 @@ main (argc, argv)
 #endif
       )
     {
-      fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n",
 #ifdef MAIL_USE_POP
-	       " [POP-password]"
+      fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n",
+	       " [POP-password]");
 #else
-	       ""
+      fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n", "");
 #endif
-	       );
       exit (1);
     }