tRename DATADIR #define to DPDATADIR to avoid clashing with a Win32 API name. - vaccinewars - be a doctor and try to vaccinate the world
 (HTM) git clone git://src.adamsgaard.dk/vaccinewars
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit a0ab9bd376c839eb5048870043f82a510691bddb
 (DIR) parent 745aa35e93ae01ce785b2e3e1fd158a2e4d1b882
 (HTM) Author: Ben Webb <ben@salilab.org>
       Date:   Wed, 11 Sep 2002 10:09:07 +0000
       
       Rename DATADIR #define to DPDATADIR to avoid clashing with a Win32 API name.
       
       
       Diffstat:
         M configure.in                        |       4 ++--
         M src/dopewars.c                      |       9 +++++----
       
       2 files changed, 7 insertions(+), 6 deletions(-)
       ---
 (DIR) diff --git a/configure.in b/configure.in
       t@@ -349,8 +349,8 @@ if test -n "$GCC"; then
        fi
        
        dnl Tell dopewars where the high scores, docs and locale files are
       -DP_EXPAND_DIR(DATADIR, '${datadir}')
       -AC_DEFINE_UNQUOTED(DATADIR, "$DATADIR",
       +DP_EXPAND_DIR(DPDATADIR, '${datadir}')
       +AC_DEFINE_UNQUOTED(DPDATADIR, "$DPDATADIR",
                           [The directory containing the high score file and docs])
        
        localedir=${datadir}/locale
 (DIR) diff --git a/src/dopewars.c b/src/dopewars.c
       t@@ -2338,7 +2338,7 @@ gchar *GetDocRoot(void)
          path = g_strdup_printf("file://%s\\", bindir);
          g_free(bindir);
        #else
       -  path = g_strdup_printf("file://%s/doc/%s-%s/", DATADIR, PACKAGE, VERSION);
       +  path = g_strdup_printf("file://%s/doc/%s-%s/", DPDATADIR, PACKAGE, VERSION);
        #endif
          return path;
        }
       t@@ -2587,7 +2587,7 @@ Drug dealing game based on \"Drug Wars\" by John E. Dell\n\
                                    client (GTK+ or Win32)\n\
          -t, --text-client       force the use of a text-mode client (curses) (by\n\
                                    default, a windowed client is used when possible)\n\
       -  -C, --convert=FILE      convert an \"old format\" score file to the new format\n"), DATADIR);
       +  -C, --convert=FILE      convert an \"old format\" score file to the new format\n"), DPDATADIR);
          PluginHelp();
          g_print(_("  -h, --help              display this help information\n\
          -v, --version           output version information and exit\n\n\
       t@@ -2621,7 +2621,8 @@ Drug dealing game based on \"Drug Wars\" by John E. Dell\n\
          -t       force the use of a text-mode client (curses)\n\
                      (by default, a windowed client is used when possible)\n\
          -C file  convert an \"old format\" score file to the new format\n\
       -  -A       connect to a locally-running server for administration\n"), DATADIR);
       +  -A       connect to a locally-running server for administration\n"),
       +           DPDATADIR);
          PluginHelp();
        g_print(_("  -h       display this help information\n\
          -v       output version information and exit\n\n\
       t@@ -2773,7 +2774,7 @@ struct CMDLINE *GeneralStartup(int argc, char *argv[])
        {
          /* First, open the hard-coded high score file with possibly
           * elevated privileges */
       -  priv_hiscore = g_strdup_printf("%s/dopewars.sco", DATADIR);
       +  priv_hiscore = g_strdup_printf("%s/dopewars.sco", DPDATADIR);
          HiScoreFile = g_strdup(priv_hiscore);
          OpenHighScoreFile();
          DropPrivileges();