--- Makefile.orig	Mon Mar  9 18:00:00 1998
+++ Makefile	Mon Jul  1 03:46:01 2002
@@ -16,8 +16,8 @@
 #
 ##############################################################################
 
-CPP = g++
-CC = gcc
+CPP = c++
+CC = cc
 
 # -c: don't link yet
 # -g: produce debugging-information, don't use together with link_flag -s
@@ -28,15 +28,19 @@
 # -c: don't link yet
 #COMPILE_FLAGS = -O3 -m486 -c
 
+.if exists(${X11BASE}/include/X11/forms.h)
+XFORMSINC = -I${X11BASE}/include/X11
+.endif
+
 # -O: normal optimization level  -c: don't link yet
-COMPILE_FLAGS = -O -c
+COMPILE_FLAGS = ${CFLAGS} -I${PREFIX}/include -I${X11BASE}/include ${XFORMSINC} -c
 
 # -s: DESTROYS symbol-table
-LINK_FLAGS = -s
+#LINK_FLAGS = -s
 
 
-SYSLIB = -L/usr/X11R6/lib -lX11 -lm
-LIBS = -L/usr/lib -ltiff -ljpeg -lgz -lforms -lXpm $(SYSLIB)
+SYSLIB = -L${X11BASE}/lib -lX11 -lm
+LIBS = -L${PREFIX}/lib -ltiff -ljpeg -lz -lforms -lXpm $(SYSLIB)
 
 OBJECTS = xmrm.o xmrm_cb.o io.o morphvec.o init.o wavemorph.o wave_rts.o wave.o\
           areas.o xmrm_main.o