$NetBSD$

--- src/Makefile.orig	2005-06-07 00:36:34.514643392 -0500
+++ src/Makefile
@@ -3,13 +3,13 @@
 #
 ############################################################################
 VERSION         = 2.1
-CC		= gcc
-CP		= g++
-OPTIONS 	= -Wall -g -pipe -fomit-frame-pointer \
+CC		= gcc ${EVERYTHING}
+CP		= g++ ${EVERYTHING}
+OPTIONS 	= ${CPPFLAGS} ${CFLAGS} -Wall -pipe -fomit-frame-pointer \
 			-DVERSION='"$(VERSION)"'
 
-INCLUDE		=
-LIBS		= -L/usr/X11R6/lib -lXpm -lX11
+INCLUDE		= -I${X11BASE}/include
+LIBS		= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXpm -lX11
 EVERYTHING	= $(OPTIONS) $(INCLUDE) $(LIBS)
 
 ###############################
