s/__openbox_version/OPENBOX_VERSION

diff --git a/src/main.cc b/src/main.cc
index f192c0a..c16fba2 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -69,7 +69,7 @@ static void showHelp(int exitval) {
               "  -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 @@ int main(int argc, char **argv) {
       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")) {

diff --git a/util/epist/main.cc b/util/epist/main.cc
index 900a234..2f39212 100644 (file)
--- a/util/epist/main.cc
+++ b/util/epist/main.cc
@@ -81,7 +81,7 @@ int main(int argc, char **argv) {
       usage();
     } else if (argvi == "-version") {
       fprintf(stderr, "epist - shipped with openbox %s\n",
-              __openbox_version);
+              OPENBOX_VERSION);
       exit(0);
     }
     else

diff --git a/version.h.in b/version.h.in
index 196c3f7..007f2f9 100644 (file)
--- a/version.h.in
+++ b/version.h.in
@@ -1 +1 @@
-#define __openbox_version "@VERSION@"
+#define OPENBOX_VERSION "@VERSION@"