--- wmtz.c.orig Thu Nov 20 22:04:56 2003 +++ wmtz.c Thu Nov 20 22:06:57 2003 @@ -51,7 +51,7 @@ #define STRSIZE 10 #define LMST 1 #define GMST 0 -#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7 +#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7\n\ http://www.geocities.com/jl1n/wmtz/wmtz.html\"" @@ -275,15 +275,15 @@ if (!Read_Config_File(config_file)) { - /* Fall back to /etc/wmtzrc */ + /* Fall back to ${PREFIX}/etc/wmtzrc */ free(config_file); config_file = malloc( 12 ); if (config_file == NULL) errH(1, 1, "malloc"); - sprintf(config_file, "/etc/wmtzrc"); + sprintf(config_file, "${PREFIX}/etc/wmtzrc "); - fprintf(stderr, "Using /etc/wmtzrc as config file.\n"); + fprintf(stderr, "Using ${PREFIX}/etc/wmtzrc as config file.\n"); Read_Config_File(config_file); } @@ -479,6 +479,7 @@ but_stat = -1; break; default: + ; } } @@ -529,6 +530,7 @@ exit(0); break; default: + ; } return; } @@ -729,7 +731,8 @@ void usage(void) { fprintf(stderr, "\nwmtz - shows local time around the world and more.\n"); - fprintf(stderr, "See ~/.wmtzrc or /etc/wmtzrc for configuration.\n\n"); + fprintf(stderr, "See ~/.wmtzrc or ${PREFIX}/etc/wmtzrc.default for\n"); + fprintf(stderr, "configuration.\n\n"); fprintf(stderr, "Usage:\n"); fprintf(stderr, " -display \n"); fprintf(stderr, " -e use specified editor\n");