$NetBSD: patch-aa,v 1.3 2003/05/06 16:21:26 jmmv Exp $

--- configure.orig	2001-03-16 18:01:49.000000000 +0100
+++ configure
@@ -18,7 +18,7 @@ ac_help="$ac_help
        (e.g., PFX=/usr/share if the dir WindowMaker/Styles is part of this dir)"
 ac_help="$ac_help
   --with-wmakeretcprefix=PFX Prefix to sysconfig files installed by Window Maker
-       (e.g., PFX=/etc if the file WindowMaker/WindowMaker is part of this dir)"
+       (e.g., PFX=/etc if the file WindowMaker is part of this dir)"
 ac_help="$ac_help
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
 ac_help="$ac_help
@@ -914,13 +914,13 @@ echo $ac_n "checking for Window Maker sy
 echo "configure:915: checking for Window Maker sysconfig directory" >&5
 if test ! -r "$wmakeretcprefix/WindowMaker/WindowMaker"; then
         echo "$ac_t""missing" 1>&6
-        echo "configure: warning: file WindowMaker not found in $wmakeretcprefix/WindowMaker.
+        echo "configure: warning: file WindowMaker not found in $wmakeretcprefix.
 Use option --with-wmakeretcprefix=PFX to find Window Maker sysconfig directory" 1>&2
 else
-        echo "$ac_t""$wmakeretcprefix/WindowMaker" 1>&6
+        echo "$ac_t""$wmakeretcprefix" 1>&6
 fi
 cat >> confdefs.h <<EOF
-#define WMAKERDIR "$wmakeretcprefix/WindowMaker"
+#define WMAKERDIR "$wmakeretcprefix"
 EOF
 
 
@@ -1259,8 +1259,8 @@ if test "$x_libraries" != "NONE"; then
 fi
 
 # Add some common include and library path's
-CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/X11/include/ -I/usr/X11R6/include/ -I/usr/X11R6/include/X11 -I/usr/openwin/include -I$wprefix/include"
-LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib -L$wprefix/lib"
+CPPFLAGS="$CPPFLAGS"
+LDFLAGS="$LDFLAGS"
 
 # Checks for socket and nsl library, required on Solaris systems
 # (reported by Peter da Silva <peter@baileynm.com>)
