diff -Naur grx-2.4.6p4.orig/configure grx-2.4.6p4/configure
--- grx-2.4.6p4.orig/configure	2003-06-02 20:45:27.000000000 +0200
+++ grx-2.4.6p4/configure	2003-06-02 20:44:44.000000000 +0200
@@ -50,8 +50,8 @@
 default_x11base=/usr/X11R6
 x11base="$default_x11base"
 
-default_unitspath='${exec_prefix}/units'
-unitspath="$default_unitspath"
+default_unitpath='${exec_prefix}/units'
+unitpath="$default_unitpath"
 
 HAVE_LIBJPEG=n
 HAVE_LIBPNG=n
@@ -181,8 +181,8 @@
       fontpath)    fontpath="$default_fontpath";;
       x11-base=*)  x11base="$ac_optarg";;
       x11-base)    echo "$0: \`--with-x11-base' requires an argument" >&2; exit 1;;
-      unitspath=*)  unitspath="$ac_optarg";;
-      unitspath)    echo "$0: \`--with-unitspath' requires an argument" >&2; exit 1;;
+      unit-path=*)  unitpath="$ac_optarg";;
+      unit-path)    echo "$0: \`--with-unit-path' requires an argument" >&2; exit 1;;
     esac;;
   -without-* | --without-*)
     case "`echo "$ac_option" | sed -e 's/^-*without-//'`" in
@@ -229,7 +229,7 @@
   --with-fontpath           set GRX font path to $default_fontpath
   --without-fontpath        use no GRX font path [default]
   --with-x11-base=DIR       use DIR as X11 base directry [$default_x11base]
-  --with-unitspath=PATH     set GPC units path to PATH [$default_unitspath]
+  --with-unit-path=PATH     set GPC units path to PATH [$default_unitpath]
 
 The following options apply to the Linux console (not X11) target only:
 
@@ -329,7 +329,7 @@
              /^libdir=/s|=.*|=$libdir|;
              /^datadir=/s|=.*|=$datadir|;
              /^includedir=/s|=.*|=$includedir|;
-             /^unitsdir=/s|=.*|=$unitspath|;
+             /^unitsdir=/s|=.*|=$unitpath|;
              /^infodir=/s|=.*|=$infodir|;}
            /^ifdef $cfgsection\$/,/^endif\$/{
              /^X11BASE=/s|=.*|=$x11base|;
diff -Naur grx-2.4.6p4.orig/makedefs.grx grx-2.4.6p4/makedefs.grx
--- grx-2.4.6p4.orig/makedefs.grx	2003-06-02 20:45:27.000000000 +0200
+++ grx-2.4.6p4/makedefs.grx	2003-06-02 20:41:48.000000000 +0200
@@ -105,9 +105,6 @@
 includedir=${prefix}/include
 unitsdir=${exec_prefix}/units
 
-# Set the default GRX font path
-#GRX_DEFAULT_FONT_PATH=${libdir}/fonts/grx
-
 endif
 
 ### LINUX CONSOLE SPECIFIC ###########################################
@@ -134,6 +131,9 @@
 # 1, and 4 bpp and the 8 bpp mode X
 USE_INOUTP_FRAMEDRIVERS=y
 
+# Set the default GRX font path
+#GRX_DEFAULT_FONT_PATH=${libdir}/fonts/grx
+
 endif
 
 ### LINUX X11 SPECIFIC ###############################################
@@ -158,6 +158,9 @@
 # note: some systems need -lsocket added
 X11LIBS=-L$(X11BASE)/lib -lX11
 
+# Set the default GRX font path
+#GRX_DEFAULT_FONT_PATH=${libdir}/fonts/grx
+
 endif
 
 ### DOS DJGPPv2 SPECIFIC #############################################