$NetBSD: patch-aa,v 1.1.1.1 2001/01/18 20:17:11 jlam Exp $

--- Config.h.orig	Wed May 24 11:48:59 2000
+++ Config.h
@@ -75,8 +75,8 @@
 
 // What to run to get a new window (from the "New" menu option)
 #define CONFIG_NEW_WINDOW_LABEL "New"
-//#define CONFIG_NEW_WINDOW_COMMAND "xterm"
-#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
+#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+//#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
 #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
 // or, for example,
 //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
@@ -91,7 +91,7 @@
 // middle-button menu
 #define CONFIG_COMMAND_MENU       ".wmx"
 // only used if COMMAND_MENU is not found; ignored if invalid directory:
-#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/local/lib/wmx/menu"
+#define CONFIG_SYSTEM_COMMAND_MENU	PREFIX "/etc/wmx/menu"
 // append screennumber to COMMAND_MENU directory;
 // use non screen style as fallback
 #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
@@ -373,7 +373,9 @@
 // that you are not currently on, some strange things happen.
 // (Patch due to Henri Naccache <henri@asu.edu>)
 
+#ifndef CONFIG_GNOME_COMPLIANCE
 #define CONFIG_GNOME_COMPLIANCE   False
+#endif
 
 // This lets you choose whether to keep the regular wmx
 // mouse button behaviour, or go w/ the GNOME-described one.
@@ -383,7 +385,9 @@
 // command menu, and the middle mouse button (button2)
 // acts like the left mouse normally does (list of windows)
 
+#ifndef CONFIG_GNOME_BUTTON_COMPLIANCE
 #define CONFIG_GNOME_BUTTON_COMPLIANCE   False
+#endif
 
 #endif