--- ./man/grok.1	Tue May 22 15:18:58 2001
+++ ../xmbase_grok-1.5/./man/grok.1	Fri Nov 15 15:17:18 2002
@@ -101,7 +101,7 @@
 .LP
 Below, GBIN and GLIB refer to the installation directories specified at
 the beginning of the Imakefile when the programs were compiled. They are
-/usr/local/bin and /usr/local/lib, respectively, by default.
+/usr/freeware/bin and /usr/freeware/lib, respectively, by default.
 .IP *.gf 18
 Files ending with the extension .gf are assumed to contain
 .B grok
--- ./src/Makefile	Tue May 22 16:37:57 2001
+++ ../xmbase_grok-1.5/./src/Makefile	Fri Nov 15 14:41:40 2002
@@ -101,68 +101,71 @@
 
 
 #---------------------------------------------------------------
+CC=cc
+GCC=gcc
+
 sgi5:
-	env CF="$(SGI5_C)" LF="$(SGI5_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(SGI5_C)" LF="$(SGI5_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 sgi6:
-	env CF="$(SGI6_C)" LF="$(SGI6_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(SGI6_C)" LF="$(SGI6_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 sgi:
-	env CF="$(SGI6_C)" LF="$(SGI6_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(SGI6_C)" LF="$(SGI6_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 linux:
-	env CF="$(LINUX_C)" LF="$(LINUX_L)" YO="" MYCC=gcc make -f Makefile all
+	env CF="$(LINUX_C)" LF="$(LINUX_L)" YO="" MYCC="$(GCC)" $(MAKE) -f Makefile all
 
 hp:
-	env CF="$(HP_C)" LF="$(HP_L)" YO="-Nm15000" MYCC=cc make -f Makefile all
+	env CF="$(HP_C)" LF="$(HP_L)" YO="-Nm15000" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 ibm:
-	env CF="$(IBM_C)" LF="$(IBM_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(IBM_C)" LF="$(IBM_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 osf:
-	env CF="$(OSF_C)" LF="$(OSF_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(OSF_C)" LF="$(OSF_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 sun:
-	env CF="$(SUN_C)" LF="$(SUN_L)" YO="" MYCC=acc make -f Makefile all
+	env CF="$(SUN_C)" LF="$(SUN_L)" YO="" MYCC=acc $(MAKE) -f Makefile all
 
 sung:
-	env CF="$(SUNG_C)" LF="$(SUNG_L)" YO="" MYCC=gcc make -f Makefile all
+	env CF="$(SUNG_C)" LF="$(SUNG_L)" YO="" MYCC="$(GCC)" $(MAKE) -f Makefile all
 
 sol:
-	env CF="$(SOL_C)" LF="$(SOL_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(SOL_C)" LF="$(SOL_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 ultrix:
-	env CF="$(ULTRIX_C)" LF="$(ULTRIX_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(ULTRIX_C)" LF="$(ULTRIX_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 cdc:
-	env CF="$(CDC_C)" LF="$(CDC_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(CDC_C)" LF="$(CDC_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 mips:
-	env CF="$(MIPS_C)" LF="$(MIPS_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(MIPS_C)" LF="$(MIPS_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 dg:
-	env CF="$(DG_C)" LF="$(DG_L)" YO="" MYCC=gcc make -f Makefile all
+	env CF="$(DG_C)" LF="$(DG_L)" YO="" MYCC="$(GCC)" $(MAKE) -f Makefile all
 
 sni:
-	env CF="$(SNI_C)" LF="$(SNI_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(SNI_C)" LF="$(SNI_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 sco:
-	env CF="$(SCO_C)" LF="$(SCO_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(SCO_C)" LF="$(SCO_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 ncr:
-	env CF="$(NCR_C)" LF="$(NCR_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(NCR_C)" LF="$(NCR_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 usl:
-	env CF="$(USL_C)" LF="$(USL_L)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(USL_C)" LF="$(USL_L)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 uslm:
-	env CF="$(USL_C)" LF="$(USL_Lm)" YO="" MYCC=cc make -f Makefile all
+	env CF="$(USL_C)" LF="$(USL_Lm)" YO="" MYCC="$(CC)" $(MAKE) -f Makefile all
 
 bsdi:
-	env CF="$(BSDI_C)" LF="$(BSDI_L)" YO="" MYCC=acc make -f Makefile all
+	env CF="$(BSDI_C)" LF="$(BSDI_L)" YO="" MYCC=acc $(MAKE) -f Makefile all
 
 bsdig:
-	env CF="$(BSDIG_C)" LF="$(BSDIG_L)" YO="" MYCC=gcc make -f Makefile all
+	env CF="$(BSDIG_C)" LF="$(BSDIG_L)" YO="" MYCC="$(GCC)" $(MAKE) -f Makefile all