diff -Naur grx-2.4.6p3/configure grx-2.4.6p3_makefile+configure/configure
--- grx-2.4.6p3/configure	2002-10-16 22:39:58.000000000 +0200
+++ grx-2.4.6p3_makefile+configure/configure	2003-05-25 16:36:46.000000000 +0200
@@ -29,6 +29,12 @@
 
 default_prefix=/usr/local
 prefix=$default_prefix
+exec_prefix='${prefix}'
+bindir='${exec_prefix}/bin'
+datadir='${prefix}/share'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+infodir='${prefix}/info'
 
 # "Detect" default target (wrong for cross-compiling)
 if [ x"$COMSPEC" != x ]; then
@@ -38,12 +44,15 @@
 fi
 target=$default_target
 
-default_fontpath=/usr/local/lib/fonts/grx
+default_fontpath='${libdir}/fonts/grx'
 fontpath=""
 
 default_x11base=/usr/X11R6
 x11base="$default_x11base"
 
+default_unitspath='${exec_prefix}/units'
+unitspath="$default_unitspath"
+
 HAVE_LIBJPEG=n
 HAVE_LIBPNG=n
 NEED_ZLIB=n
@@ -79,14 +88,54 @@
 
   -s | --silent | --silen | --sile | --sil | --si | --s)
     silent=y;;
+
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
     prefix="$ac_optarg";;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
   -target | --target | --targe | --targ | --tar | --ta | --t)
     ac_prev=target;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
     target="$ac_optarg";;
+
   # Don't complain about unknown enable, disable, with and without options
   -enable-* | --enable-* | -en-* | --en-*)
     case "`echo "$ac_option" | sed -e 's/^-*enable-//;s/^-*en-//'`" in
@@ -132,6 +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;;
     esac;;
   -without-* | --without-*)
     case "`echo "$ac_option" | sed -e 's/^-*without-//'`" in
@@ -144,9 +195,21 @@
   --help                    print this message and exit
   --version                 print version information and exit
   --silent                  silent operation
-  --prefix=PREFIX           install files in PREFIX [$default_prefix]
+
+  --prefix=PREFIX           install architecture-independent files in PREFIX
+                            [$default_prefix]
+  --exec-prefix=EPREFIX     install architecture-dependent files in EPREFIX
+                            [PREFIX]
+  --bindir=DIR              user executables [EPREFIX/bin]
+  --datadir=DIR             read-only architecture-independent data
+                            [PREFIX/share]
+  --libdir=DIR              object code libraries [EPREFIX/lib]
+  --includedir=DIR          C header files [PREFIX/include]
+  --infodir=DIR             info documentation [PREFIX/info]
+
   --target=TARGET           configure for TARGET [$default_target]
                             possible values: DJGPP, X11, svgalib
+
   --enable-jpeg             include JPEG support [no]
   --enable-png              include PNG support [no]
   --enable-z or             use zlib [no]
@@ -161,12 +224,15 @@
   --enable-bgi              include BGI support [yes]
   --enable-lsocket          link lsocket [no]
   --disable-FOO             opposite of --enable-FOO
+
   --with-fontpath=PATH      set GRX font path to PATH
   --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]
 
 The following options apply to the Linux console (not X11) target only:
+
   --enable-direct-mouse     use PS/2 instead of svgalib mouse driver [no]
   --enable-svgalib          use svgalib driver [yes]
   --enable-framebuffer      use framebuffer driver [yes]
@@ -256,8 +322,16 @@
            /^USE_FRAMEBUFFER_DRIVER=/s/=.*/=$USE_FRAMEBUFFER_DRIVER/;
            /^SET_SUIDROOT=/s/=.*/=$SET_SUIDROOT/;
            /^USE_INOUTP_FRAMEDRIVERS=/s/=.*/=$USE_INOUTP_FRAMEDRIVERS/;
+           /^ifdef GRXVUNX\$/,/^endif\$/{
+             /^prefix=/s|=.*|=$prefix|;
+             /^exec_prefix=/s|=.*|=$exec_prefix|;
+             /^bindir=/s|=.*|=$bindir|;
+             /^libdir=/s|=.*|=$libdir|;
+             /^datadir=/s|=.*|=$datadir|;
+             /^includedir=/s|=.*|=$includedir|;
+             /^unitsdir=/s|=.*|=$unitspath|;
+             /^infodir=/s|=.*|=$infodir|;}
            /^ifdef $cfgsection\$/,/^endif\$/{
-             /^INSTALLDIR=/s|=.*|=$prefix|;
              /^X11BASE=/s|=.*|=$x11base|;
              $subst_fontpath;
              /^X11LIBS=/s/\$/$lsocket/;
diff -Naur grx-2.4.6p3/makedefs.grx grx-2.4.6p3_makefile+configure/makedefs.grx
--- grx-2.4.6p3/makedefs.grx	2003-04-02 21:36:46.000000000 +0200
+++ grx-2.4.6p3_makefile+configure/makedefs.grx	2003-05-25 16:37:30.000000000 +0200
@@ -78,18 +78,41 @@
 #CCOPT += -DNO_LEFTSIDE_LVALUE_CAST
 #CCOPT += -DNO_LEFTSIDE_PTR_CAST
 
-### LINUX CONSOLE SPECIFIC ###########################################
+### COMMON UNIX SETTINGS #############################################
 
 ifdef GRXVLNX
+GRXVUNX=y
+endif
+
+ifdef GRXVX11
+GRXVUNX=y
+endif
+
+ifdef GRXVUNX
 
 # place libgrx20.a and libgrx20.so in lib/unix
 GRX_LIB_SUBDIR=unix
 
-# Set here the default destination dir for install and uninstall targets
-INSTALLDIR=/usr/local
+# Set here the default destination dirs for install and uninstall targets
+prefix=/usr/local
+exec_prefix=${prefix}
+
+bindir=${exec_prefix}/bin
+libdir=${exec_prefix}/lib
+datadir=${prefix}/share
+
+infodir=${prefix}/info
+includedir=${prefix}/include
+unitsdir=${exec_prefix}/units
 
 # Set the default GRX font path
-#GRX_DEFAULT_FONT_PATH=/usr/local/lib/fonts/grx
+#GRX_DEFAULT_FONT_PATH=${libdir}/fonts/grx
+
+endif
+
+### LINUX CONSOLE SPECIFIC ###########################################
+
+ifdef GRXVLNX
 
 # Use direct PS/2 mouse driver instead the svgalib one
 USE_DIRECT_MOUSE_DRIVER=n
@@ -117,15 +140,6 @@
 
 ifdef GRXVX11
 
-# place libgrx20X.a and libgrx20X.so in lib/unix
-GRX_LIB_SUBDIR=unix
-
-# Set here the destination dir for install and uninstall targets
-INSTALLDIR=/usr/local
-
-# Set the default GRX font path
-#GRX_DEFAULT_FONT_PATH=/usr/local/lib/fonts/grx
-
 # Set to try to use the XFree86 Direct Graphics Access driver (DGA2)
 # (if DGA2 is not available, fall back to the windowed X11 driver)
 # CAUTION! As of XFree86-4.2.1, DGA/DGA2 is unstable and may lockup!
diff -Naur grx-2.4.6p3/src/makefile.lnx grx-2.4.6p3_makefile+configure/src/makefile.lnx
--- grx-2.4.6p3/src/makefile.lnx	2003-04-02 21:37:12.000000000 +0200
+++ grx-2.4.6p3_makefile+configure/src/makefile.lnx	2003-05-25 16:36:46.000000000 +0200
@@ -178,42 +178,42 @@
 	rm -f $(UTILP) $(UTILPS)
 
 install: libst libsh
-	install -m 0755 -d $(INSTALLDIR)/lib
-	install -m 0755 -d $(INSTALLDIR)/include
-	install -m 0644 $(GRX20ST) $(INSTALLDIR)/lib
+	install -m 0755 -d $(DESTDIR)$(libdir)
+	install -m 0755 -d $(DESTDIR)$(includedir)
+	install -m 0644 $(GRX20ST) $(DESTDIR)$(libdir)
 ifeq ($(INCLUDE_SHARED_SUPPORT),y)
-	install -m 0755 $(GRX20SHna) $(INSTALLDIR)/lib
-	ln -sf $(notdir $(GRX20SHna)) $(INSTALLDIR)/lib/$(notdir $(GRX20SHli))
-	ln -sf $(notdir $(GRX20SHli)) $(INSTALLDIR)/lib/$(notdir $(GRX20SH))
-endif
-	install -m 0644 ../include/grx20.h $(INSTALLDIR)/include
-	install -m 0644 ../include/grxkeys.h $(INSTALLDIR)/include
-	install -m 0644 ../include/libbcc.h $(INSTALLDIR)/include
+	install -m 0755 $(GRX20SHna) $(DESTDIR)$(libdir)
+	ln -sf $(notdir $(GRX20SHna)) $(DESTDIR)$(libdir)/$(notdir $(GRX20SHli))
+	ln -sf $(notdir $(GRX20SHli)) $(DESTDIR)$(libdir)/$(notdir $(GRX20SH))
+endif
+	install -m 0644 ../include/grx20.h $(DESTDIR)$(includedir)
+	install -m 0644 ../include/grxkeys.h $(DESTDIR)$(includedir)
+	install -m 0644 ../include/libbcc.h $(DESTDIR)$(includedir)
 ifeq ($(INCLUDE_PRINTING_CODE),y)
-	install -m 0644 ../addons/print/grxprint.h $(INSTALLDIR)/include
+	install -m 0644 ../addons/print/grxprint.h $(DESTDIR)$(includedir)
 endif
 ifeq ($(INCLUDE_GPC_SUPPORT),y)
-	install -m 0755 -d $(INSTALLDIR)/units
-	install -m 0644 ../pascal/grx.pas $(INSTALLDIR)/units
-	install -m 0644 ../pascal/bgi/graph.pas $(INSTALLDIR)/units
+	install -m 0755 -d $(DESTDIR)$(unitsdir)
+	install -m 0644 ../pascal/grx.pas $(DESTDIR)$(unitsdir)
+	install -m 0644 ../pascal/bgi/graph.pas $(DESTDIR)$(unitsdir)
 endif
 
 uninstall:
-	rm -f $(INSTALLDIR)/lib/$(notdir $(GRX20ST))
+	rm -f $(DESTDIR)$(libdir)/$(notdir $(GRX20ST))
 ifeq ($(INCLUDE_SHARED_SUPPORT),y)
-	rm -f $(INSTALLDIR)/lib/$(notdir $(GRX20SH))
-	rm -f $(INSTALLDIR)/lib/$(notdir $(GRX20SHli))
-	rm -f $(INSTALLDIR)/lib/$(notdir $(GRX20SHna))
-endif
-	rm -f $(INSTALLDIR)/include/grx20.h
-	rm -f $(INSTALLDIR)/include/grxkeys.h
-	rm -f $(INSTALLDIR)/include/libbcc.h
+	rm -f $(DESTDIR)$(libdir)/$(notdir $(GRX20SH))
+	rm -f $(DESTDIR)$(libdir)/$(notdir $(GRX20SHli))
+	rm -f $(DESTDIR)$(libdir)/$(notdir $(GRX20SHna))
+endif
+	rm -f $(DESTDIR)$(includedir)/grx20.h
+	rm -f $(DESTDIR)$(includedir)/grxkeys.h
+	rm -f $(DESTDIR)$(includedir)/libbcc.h
 ifeq ($(INCLUDE_PRINTING_CODE),y)
-	rm -f $(INSTALLDIR)/include/grxprint.h
+	rm -f $(DESTDIR)$(includedir)/grxprint.h
 endif
 ifeq ($(INCLUDE_GPC_SUPPORT),y)
-	rm -f $(INSTALLDIR)/units/grx.pas
-	rm -f $(INSTALLDIR)/units/graph.pas
+	rm -f $(DESTDIR)$(unitsdir)/grx.pas
+	rm -f $(DESTDIR)$(unitsdir)/graph.pas
 endif
 
 setsuid: $(UTILPS)
@@ -225,41 +225,41 @@
 endif
 
 install-info:
-	install -m 0755 -d $(INSTALLDIR)/info
-	install -m 0644 ../doc/grx*um.inf $(INSTALLDIR)/info/grx.info
-	for info_dir_file in $(INSTALLDIR)/info/dir /etc/info-dir; do \
+	install -m 0755 -d $(DESTDIR)$(infodir)
+	install -m 0644 ../doc/grx*um.inf $(DESTDIR)$(infodir)/grx.info
+	for info_dir_file in $(DESTDIR)$(infodir)/dir /etc/info-dir; do \
 	  if [ -w $$info_dir_file ]; then \
-	    install-info --dir-file=$$info_dir_file $(INSTALLDIR)/info/grx.info; \
+	    install-info --dir-file=$$info_dir_file $(DESTDIR)$(infodir)/grx.info; \
 	  fi; \
 	done
 
 uninstall-info:
-	rm -f $(INSTALLDIR)/info/grx.info
-	for info_dir_file in $(INSTALLDIR)/info/dir /etc/info-dir; do \
+	rm -f $(DESTDIR)$(infodir)/grx.info
+	for info_dir_file in $(DESTDIR)$(infodir)/dir /etc/info-dir; do \
 	  if [ -w $$info_dir_file ]; then \
 	    install-info --dir-file=$$info_dir_file -r grx; \
 	  fi; \
 	done
 
 install-bin: $(UTILP) $(UTILPS)
-	install -m 0755 -d $(INSTALLDIR)/bin
-	install -m 0755 ../bin/bin2c $(INSTALLDIR)/bin
-	install -m 0755 ../bin/fnt2c $(INSTALLDIR)/bin
-	install -m 0755 ../bin/lfbinfo $(INSTALLDIR)/bin
-	install -m $(EXECBITS) ../bin/modetest $(INSTALLDIR)/bin
+	install -m 0755 -d $(DESTDIR)$(bindir)
+	install -m 0755 ../bin/bin2c $(DESTDIR)$(bindir)
+	install -m 0755 ../bin/fnt2c $(DESTDIR)$(bindir)
+	install -m 0755 ../bin/lfbinfo $(DESTDIR)$(bindir)
+	install -m $(EXECBITS) ../bin/modetest $(DESTDIR)$(bindir)
 
 uninstall-bin:
-	rm -f $(INSTALLDIR)/bin/bin2c
-	rm -f $(INSTALLDIR)/bin/fnt2c
-	rm -f $(INSTALLDIR)/bin/lfbinfo
-	rm -f $(INSTALLDIR)/bin/modetest
+	rm -f $(DESTDIR)$(bindir)/bin2c
+	rm -f $(DESTDIR)$(bindir)/fnt2c
+	rm -f $(DESTDIR)$(bindir)/lfbinfo
+	rm -f $(DESTDIR)$(bindir)/modetest
 
 ifdef GRX_DEFAULT_FONT_PATH
 install-fonts:
-	install -m 0755 -d $(GRX_DEFAULT_FONT_PATH)
-	install -m 0644 ../fonts/* $(GRX_DEFAULT_FONT_PATH)
+	install -m 0755 -d $(DESTDIR)$(GRX_DEFAULT_FONT_PATH)
+	install -m 0644 ../fonts/* $(DESTDIR)$(GRX_DEFAULT_FONT_PATH)
 uninstall-fonts:
-	rm -f $(GRX_DEFAULT_FONT_PATH)/*
+	rm -f $(DESTDIR)$(GRX_DEFAULT_FONT_PATH)/*
 endif
 
 dep:
diff -Naur grx-2.4.6p3/src/makefile.x11 grx-2.4.6p3_makefile+configure/src/makefile.x11
--- grx-2.4.6p3/src/makefile.x11	2003-04-02 21:36:34.000000000 +0200
+++ grx-2.4.6p3_makefile+configure/src/makefile.x11	2003-05-25 16:36:46.000000000 +0200
@@ -172,42 +172,42 @@
 	rm -f $(UTILP) $(UTILPX)
 
 install: libst libsh
-	install -m 0755 -d $(INSTALLDIR)/lib
-	install -m 0755 -d $(INSTALLDIR)/include
-	install -m 0644 $(GRX20ST) $(INSTALLDIR)/lib
+	install -m 0755 -d $(DESTDIR)$(libdir)
+	install -m 0755 -d $(DESTDIR)$(includedir)
+	install -m 0644 $(GRX20ST) $(DESTDIR)$(libdir)
 ifeq ($(INCLUDE_SHARED_SUPPORT),y)
-	install -m 0755 $(GRX20SHna) $(INSTALLDIR)/lib
-	ln -sf $(notdir $(GRX20SHna)) $(INSTALLDIR)/lib/$(notdir $(GRX20SHli))
-	ln -sf $(notdir $(GRX20SHli)) $(INSTALLDIR)/lib/$(notdir $(GRX20SH))
-endif
-	install -m 0644 ../include/grx20.h $(INSTALLDIR)/include
-	install -m 0644 ../include/grxkeys.h $(INSTALLDIR)/include
-	install -m 0644 ../include/libbcc.h $(INSTALLDIR)/include
+	install -m 0755 $(GRX20SHna) $(DESTDIR)$(libdir)
+	ln -sf $(notdir $(GRX20SHna)) $(DESTDIR)$(libdir)/$(notdir $(GRX20SHli))
+	ln -sf $(notdir $(GRX20SHli)) $(DESTDIR)$(libdir)/$(notdir $(GRX20SH))
+endif
+	install -m 0644 ../include/grx20.h $(DESTDIR)$(includedir)
+	install -m 0644 ../include/grxkeys.h $(DESTDIR)$(includedir)
+	install -m 0644 ../include/libbcc.h $(DESTDIR)$(includedir)
 ifeq ($(INCLUDE_PRINTING_CODE),y)
-	install -m 0644 ../addons/print/grxprint.h $(INSTALLDIR)/include
+	install -m 0644 ../addons/print/grxprint.h $(DESTDIR)$(includedir)
 endif
 ifeq ($(INCLUDE_GPC_SUPPORT),y)
-	install -m 0755 -d $(INSTALLDIR)/units
-	install -m 0644 ../pascal/grx.pas $(INSTALLDIR)/units
-	install -m 0644 ../pascal/bgi/graph.pas $(INSTALLDIR)/units
+	install -m 0755 -d $(DESTDIR)$(unitsdir)
+	install -m 0644 ../pascal/grx.pas $(DESTDIR)$(unitsdir)
+	install -m 0644 ../pascal/bgi/graph.pas $(DESTDIR)$(unitsdir)
 endif
 
 uninstall:
-	rm -f $(INSTALLDIR)/lib/$(notdir $(GRX20ST))
+	rm -f $(DESTDIR)$(libdir)/$(notdir $(GRX20ST))
 ifeq ($(INCLUDE_SHARED_SUPPORT),y)
-	rm -f $(INSTALLDIR)/lib/$(notdir $(GRX20SH))
-	rm -f $(INSTALLDIR)/lib/$(notdir $(GRX20SHli))
-	rm -f $(INSTALLDIR)/lib/$(notdir $(GRX20SHna))
-endif
-	rm -f $(INSTALLDIR)/include/grx20.h
-	rm -f $(INSTALLDIR)/include/grxkeys.h
-	rm -f $(INSTALLDIR)/include/libbcc.h
+	rm -f $(DESTDIR)$(libdir)/$(notdir $(GRX20SH))
+	rm -f $(DESTDIR)$(libdir)/$(notdir $(GRX20SHli))
+	rm -f $(DESTDIR)$(libdir)/$(notdir $(GRX20SHna))
+endif
+	rm -f $(DESTDIR)$(includedir)/grx20.h
+	rm -f $(DESTDIR)$(includedir)/grxkeys.h
+	rm -f $(DESTDIR)$(includedir)/libbcc.h
 ifeq ($(INCLUDE_PRINTING_CODE),y)
-	rm -f $(INSTALLDIR)/include/grxprint.h
+	rm -f $(DESTDIR)$(includedir)/grxprint.h
 endif
 ifeq ($(INCLUDE_GPC_SUPPORT),y)
-	rm -f $(INSTALLDIR)/units/grx.pas
-	rm -f $(INSTALLDIR)/units/graph.pas
+	rm -f $(DESTDIR)$(unitsdir)/grx.pas
+	rm -f $(DESTDIR)$(unitsdir)/graph.pas
 endif
 
 setsuid: $(UTILPX)
@@ -219,39 +219,39 @@
 endif
 
 install-info:
-	install -m 0755 -d $(INSTALLDIR)/info
-	install -m 0644 ../doc/grx*um.inf $(INSTALLDIR)/info/grx.info
-	for info_dir_file in $(INSTALLDIR)/info/dir /etc/info-dir; do \
+	install -m 0755 -d $(DESTDIR)$(infodir)
+	install -m 0644 ../doc/grx*um.inf $(DESTDIR)$(infodir)/grx.info
+	for info_dir_file in $(DESTDIR)$(infodir)/dir /etc/info-dir; do \
 	  if [ -w $$info_dir_file ]; then \
-	    install-info --dir-file=$$info_dir_file $(INSTALLDIR)/info/grx.info; \
+	    install-info --dir-file=$$info_dir_file $(DESTDIR)$(infodir)/grx.info; \
 	  fi; \
 	done
 
 uninstall-info:
-	rm -f $(INSTALLDIR)/info/grx.info
-	for info_dir_file in $(INSTALLDIR)/info/dir /etc/info-dir; do \
+	rm -f $(DESTDIR)$(infodir)/grx.info
+	for info_dir_file in $(DESTDIR)$(infodir)/dir /etc/info-dir; do \
 	  if [ -w $$info_dir_file ]; then \
 	    install-info --dir-file=$$info_dir_file -r grx; \
 	  fi; \
 	done
 
 install-bin: $(UTILP) $(UTILPX)
-	install -m 0755 -d $(INSTALLDIR)/bin
-	install -m 0755 ../bin/bin2c $(INSTALLDIR)/bin
-	install -m 0755 ../bin/fnt2c $(INSTALLDIR)/bin
-	install -m $(EXECBITS) ../bin/xmodetest $(INSTALLDIR)/bin
+	install -m 0755 -d $(DESTDIR)$(bindir)
+	install -m 0755 ../bin/bin2c $(DESTDIR)$(bindir)
+	install -m 0755 ../bin/fnt2c $(DESTDIR)$(bindir)
+	install -m $(EXECBITS) ../bin/xmodetest $(DESTDIR)$(bindir)
 
 uninstall-bin:
-	rm -f $(INSTALLDIR)/bin/bin2c
-	rm -f $(INSTALLDIR)/bin/fnt2c
-	rm -f $(INSTALLDIR)/bin/xmodetest
+	rm -f $(DESTDIR)$(bindir)/bin2c
+	rm -f $(DESTDIR)$(bindir)/fnt2c
+	rm -f $(DESTDIR)$(bindir)/xmodetest
 
 ifdef GRX_DEFAULT_FONT_PATH
 install-fonts:
-	install -m 0755 -d $(GRX_DEFAULT_FONT_PATH)
-	install -m 0644 ../fonts/* $(GRX_DEFAULT_FONT_PATH)
+	install -m 0755 -d $(DESTDIR)$(GRX_DEFAULT_FONT_PATH)
+	install -m 0644 ../fonts/* $(DESTDIR)$(GRX_DEFAULT_FONT_PATH)
 uninstall-fonts:
-	rm -f $(GRX_DEFAULT_FONT_PATH)/*
+	rm -f $(DESTDIR)$(GRX_DEFAULT_FONT_PATH)/*
 endif
 
 dep: