--- configure.orig	Tue Apr  7 08:05:44 1998
+++ configure	Tue Apr 21 23:38:17 1998
@@ -9,7 +9,7 @@
 
 # Defaults:
 ac_help=
-ac_default_prefix=/usr/local
+ac_default_prefix=${prefix}
 # Any additions from configure.in:
 ac_help="$ac_help
   --enable-perlinterp     Include Perl interpreter."
@@ -1327,25 +1327,25 @@
     /usr/include/X11R5        \
     /usr/include/X11R4        \
                               \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
+    ${prefix}/X11/include    \
+    ${prefix}/X11R6/include  \
+    ${prefix}/X11R5/include  \
+    ${prefix}/X11R4/include  \
                               \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
+    ${prefix}/include/X11    \
+    ${prefix}/include/X11R6  \
+    ${prefix}/include/X11R5  \
+    ${prefix}/include/X11R4  \
                               \
     /usr/X386/include         \
     /usr/x386/include         \
     /usr/XFree86/include/X11  \
                               \
     /usr/include              \
-    /usr/local/include        \
+    ${prefix}/include        \
     /usr/unsupported/include  \
     /usr/athena/include       \
-    /usr/local/x11r5/include  \
+    ${prefix}/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \
     /usr/openwin/include      \
@@ -1402,25 +1402,25 @@
     /usr/lib/X11R5        \
     /usr/lib/X11R4        \
                           \
-    /usr/local/X11/lib    \
-    /usr/local/X11R6/lib  \
-    /usr/local/X11R5/lib  \
-    /usr/local/X11R4/lib  \
+    ${prefix}/X11/lib    \
+    ${prefix}/X11R6/lib  \
+    ${prefix}/X11R5/lib  \
+    ${prefix}/X11R4/lib  \
                           \
-    /usr/local/lib/X11    \
-    /usr/local/lib/X11R6  \
-    /usr/local/lib/X11R5  \
-    /usr/local/lib/X11R4  \
+    ${prefix}/lib/X11    \
+    ${prefix}/lib/X11R6  \
+    ${prefix}/lib/X11R5  \
+    ${prefix}/lib/X11R4  \
                           \
     /usr/X386/lib         \
     /usr/x386/lib         \
     /usr/XFree86/lib/X11  \
                           \
     /usr/lib              \
-    /usr/local/lib        \
+    ${prefix}/lib        \
     /usr/unsupported/lib  \
     /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
+    ${prefix}/x11r5/lib  \
     /usr/lpp/Xamples/lib  \
     /lib/usr/lib/X11	  \
                           \
@@ -2280,7 +2280,7 @@
 
 
 if test -z "$SKIP_MOTIF"; then
-  gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` /local/Motif*/include /local/include/Motif* /usr/local/Motif*/include /usr/local/include/Motif* /usr/include/Motif* /usr/Motif*/include /usr/local/include /usr/local/X11*/include /usr/include /usr/X11*/include /usr/include/X11* /usr/dt/include $MOTIFHOME/include $GUI_INC_LOC"
+  gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` /local/Motif*/include /local/include/Motif* ${prefix}/Motif*/include ${prefix}/include/Motif* /usr/include/Motif* /usr/Motif*/include ${prefix}/include ${prefix}/X11*/include /usr/include /usr/X11*/include /usr/include/X11* /usr/dt/include $MOTIFHOME/include $GUI_INC_LOC"
   echo $ac_n "checking for location of Motif GUI includes""... $ac_c" 1>&6
 echo "configure:2286: checking for location of Motif GUI includes" >&5
   GUI_INC_LOC=