--- Makefile.orig	Thu Sep  3 08:09:55 1998
+++ Makefile	Sat Oct  3 19:23:23 1998
@@ -1,10 +1,14 @@
 
 # where do we install the binaries and unformatted manual pages?
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man
+BINDIR = ${PREFIX}/bin
+MANDIR = ${PREFIX}/man
 SCRS = iconmaker.c
 OBJS = iconmaker.o
-LIBS = -L/usr/local/lib -L/usr/X11R6/lib -lWINGs -lwraster -lXext -lXmu -lm -ljpeg -lpng -lz -ltiff -lXpm -lPropList
+LIBS = -L${LOCALBASE}/lib -L${PREFIX}/lib -lWINGs -lwraster -lXext -lXmu -lm -ljpeg -lpng -lz -ltiff -lgif -lXpm -lPropList -lX11
+.if ${PORTOBJFORMAT} == "elf"
+LIBS+= -Wl,-rpath,${X11BASE}/lib
+.endif
+CFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include
 
 # We seem to need GCC
 CC = gcc
