--- src/Makefile.orig	Thu Apr 11 09:23:53 1996
+++ src/Makefile	Sat Sep 26 23:22:52 1998
@@ -13,7 +13,7 @@
 # If your system doesn't have a unique define already, define one here.
 
 # Linux
-CONFIGS=-DHAVE_UNISTD_H -DHAVE_ULIMIT_H
+CONFIGS=-DHAVE_UNISTD_H
 # OSF/Digital Unix/HPUX
 #CONFIGS=-fPIC -DHAVE_UNISTD_H -DHAVE_ULIMIT_H
 # Sun
@@ -27,19 +27,22 @@
 #   can send me opinions at mailto:paulh@euristix.ie
 PREFS=-DUNDO_ANY_MOVE
 
-CC=gcc
+#CC=gcc
 #DEBUG=-g -Wall -DDEBUG
 DEBUG=
-COPTIONS=-O2 -fstrength-reduce -fpcc-struct-return -DVERSION=\"${VERSION}\"
+COPTIONS=-DVERSION=\"${VERSION}\"
 
-CFLAGS=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include
+CFLAGS+=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include -I${X11BASE}/include
 LDOPTIONS=
 
 # LDLIBS should include the name of your X library path if not /usr/lib;
 # and I definitely recommend getting Xaw3d.  The extra appearance doesn't
 # appear much but it looks much better when it does.
 # Linux
-LDLIBS=-L/usr/X11R6/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11
+LDLIBS=-L${X11BASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11
+.if ${PORTOBJFORMAT} == "elf"
+LDLIBS+=-Wl,-rpath,${X11BASE}/lib
+.endif
 # Sun
 #LDLIBS=-lXpm -lXaw -lXmu -lXext -lXt -lX11 -lm