--- Makefile.orig	Thu Jan 16 06:20:29 1997
+++ Makefile	Sat Oct  3 20:01:54 1998
@@ -1,10 +1,13 @@
 
 # if you want pixmaps you'll need Xpm, so add -lXpm to the next line
-LIBS	=  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
+LIBS	=  -L$(X11BASE)/lib -lXext -lX11 -lXmu -lm
+.if $(PORTOBJFORMAT) == "elf"
+LIBS	+= -Wl,-rpath,$(X11BASE)/lib
+.endif
 
 CC	= gcc
 CCC	= gcc
-CFLAGS	= -O2
+CFLAGS	+= -O2 -I$(X11BASE)/include
 OBJECTS	= Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o listimpl.o
 
 .c.o:
@@ -14,7 +17,7 @@
 	$(CCC) -c $(CFLAGS) $<
 
 wm2:	$(OBJECTS)
-	mv -f wm2 wm2.old >& /dev/null || true
+	mv -f wm2 wm2.old 2> /dev/null || true
 	$(CCC) -o wm2 $(OBJECTS) $(LIBS)
 
 depend: