M src/main.cc → src/main.cc

@@ -69,7 +69,7 @@ "  -rc <string>\t\t\tuse alternate resource file.\n"
               "  -menu <string>\t\tuse alternate menu file.\n"
               "  -version\t\t\tdisplay version and exit.\n"
               "  -help\t\t\t\tdisplay this help text and exit.\n\n"),
-         __openbox_version);
+         OPENBOX_VERSION);
 
   // some people have requested that we print out compile options
   // as well
@@ -172,7 +172,7 @@ // print current version string
       printf("Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
              "                    2001 - 2002 Sean 'Shaleh' Perry\n"
              "                    1997 - 2000, 2002 Brad Hughes\n\n",
-             __openbox_version);
+             OPENBOX_VERSION);
 
       ::exit(0);
     } else if (! strcmp(argv[i], "-help")) {

M util/epist/main.cc → util/epist/main.cc

@@ -81,7 +81,7 @@ } else if (argvi == "-help") {
       usage();
     } else if (argvi == "-version") {
       fprintf(stderr, "epist - shipped with openbox %s\n",
-              __openbox_version);
+              OPENBOX_VERSION);
       exit(0);
     }
     else

M version.h.in → version.h.in

@@ -1,1 +1,1 @@ 
-#define __openbox_version "@VERSION@"
+#define OPENBOX_VERSION "@VERSION@"