--- Makefile.orig	2009-01-06 07:55:59.000000000 +1100
+++ Makefile	2009-09-02 09:45:23.000000000 +1000
@@ -34,9 +34,9 @@
 # some systems now use just /usr/X11 (not /usr/X11R6)
 CC = gcc
 CLDFLAGS = -g
-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
+CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI)
+LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
+XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
 LIBS = $(XLIBS) $(LIBLIB) -lm
 
 # for ppc Apple OS X to make universal (i386 and ppc binary), requires
