--- make.cfg.orig	Sun Oct 14 16:37:11 2001
+++ make.cfg	Sun Apr  6 15:23:36 2003
@@ -74,8 +74,9 @@
 linux:
 	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
 	"CC = gcc" \
-	"XINC = /usr/X11R6/include" \
-	"GLINC = /usr/include"\
+	"XINC = ${X11BASE}/include" \
+	"GLINC = ${X11BASE}/include" \
+	"JPEGINC = ${LOCALBASE}/include" \
 	"RMINC = ../include" \
 	"CFLAGS = -c -O2 -m486 -finline-functions -fomit-frame-pointer -DRM_X" \
 	"RMLIB = librm" \
@@ -89,7 +90,7 @@
 linux-debug:
 	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
 	"CC = gcc" \
-	"XINC = /usr/X11R6/include" \
+	"XINC = ${X11BASE}/include" \
 	"GLINC = /usr/include"\
 	"RMINC = ../include" \
 	"CFLAGS = -c -g -ansi -Wall -Winline -m486 -finline-functions -DRM_X" \
@@ -114,7 +115,7 @@
 	"XINC = /usr/openwin/include" \
 	"GLINC = /usr/openwin/include" \
 	"RMINC = ../include" \
-	"JPEGINC = /usr/local/include" \
+	"JPEGINC = ${LOCALBASE}/include" \
 	"CFLAGS = -O -c -Xc -Kpic -v -I/usr/openwin/include -DSOLARIS -DRM_X" \
 	"RMLIB = librm" \
 	"RMVLIB = librmv" \
@@ -130,7 +131,7 @@
 	"XINC = /usr/openwin/include" \
 	"GLINC = /usr/openwin/include" \
 	"RMINC = ../include" \
-	"JPEGINC = /usr/local/include" \
+	"JPEGINC = ${LOCALBASE}/include" \
 	"CFLAGS = -g -c -Xc -Kpic -v -I/usr/openwin/include -DSOLARIS -DRM_X" \
 	"RMLIB = librm" \
 	"RMVLIB = librmv" \