cleaning up --help output

xulrunner/app/Makefile.in

@@ -52,8 +52,10 @@ DIRS		= profile
 
 ifeq ($(USE_SHORT_LIBNAME), 1)
 PROGRAM = xulrun$(BIN_SUFFIX)
+DEFINES += -DXULRUNNER_PROGNAME=\"xulrun\"
 else
 PROGRAM = xulrunner-bin$(BIN_SUFFIX)
+DEFINES += -DXULRUNNER_PROGNAME=\"xulrunner\"
 endif
 
 REQUIRES = \
@@ -290,7 +292,7 @@ libs::
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 
-APP_NAME = XulRunner
+APP_NAME = XULRunner
 
 libs:: $(PROGRAM)
 	mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS

xulrunner/app/nsXULRunnerApp.cpp

@@ -65,7 +65,7 @@ int main(int argc, char* argv[])
                 || IsArg(argv[1], "help")
                 || IsArg(argv[1], "?"))
   {
-    printf("Usage: %s [OPTIONS] [APP-FILE [APP-OPTIONS...]]\n", argv[0]);
+    printf("Usage: " XULRUNNER_PROGNAME " [OPTIONS] [APP-FILE [APP-OPTIONS...]]\n");
     if (argc > 1) {
       // display additional information
       printf("\n"
@@ -83,7 +83,7 @@ int main(int argc, char* argv[])
   }
 
   if (argc == 2 && (IsArg(argv[1], "v") || IsArg(argv[1], "version"))) {
-    printf("Mozilla XULRunner %s (%s)\n", APP_VERSION, BUILD_ID);
+    printf("Mozilla XULRunner %s %s (Gecko:%s)\n", APP_VERSION, BUILD_ID, MOZILLA_VERSION);
     return 0;
   }