--- Makefile.orig	Sat Feb 15 13:00:15 1997
+++ Makefile	Mon Jul  1 02:35:58 2002
@@ -8,14 +8,17 @@
 # Flags that might be overriden by top makefile
 #=================================================================
 
-CC      = gcc
-CCFLAG  = -O2 -Wall -fno-strength-reduce
-LDFLAG  = -O
+#CC      = gcc
+#CCFLAG  = -O2 -Wall -fno-strength-reduce
+#LDFLAG  = -O
 SYSLIB  = -lX11 -lm
-XINCLUDE= -I/usr/X11R6/include
-XLIB    = -L/usr/X11R6/lib
+XINCLUDE= -I$(X11BASE)/include
+.if exists(${X11BASE}/include/X11/forms.h)
+XFORMSINC= -I${X11BASE}/include/X11
+.endif
+XLIB    = -L$(X11BASE)/lib
 
-INSTDIR = /usr/local
+INSTDIR = $(PREFIX)
 BINDIR = $(INSTDIR)/bin
 INSTALL = install
 
@@ -23,9 +26,9 @@
 # Flags the compiler will see
 #=================================================================
 
-CFLAGS  = $(CCFLAG) $(XINCLUDE)
+CFLAGS  = $(CCFLAG) $(XINCLUDE) $(XFORMSINC)
 LDFLAGS = $(LDFLAG) 
-LIBS    = -lforms $(SYSLIB) $(XLIB)
+LIBS    = -lforms -lXpm $(SYSLIB) $(XLIB)
 
 #=================================================================