--- Makefile.orig	Fri Jan 17 22:22:35 1997
+++ Makefile	Tue Oct 13 18:06:14 1998
@@ -142,13 +142,13 @@
 # Installation locations (edit to suit your system)
 #
 
-ROOTDIR = ### user defined ###
-SUBSYS = ### user defined ###
+ROOTDIR = $(PREFIX)
+SUBSYS = ..
 BINDIR = $(ROOTDIR)/bin
-RSCDIR = $(ROOTDIR)/setup/app-defaults
+RSCDIR = $(ROOTDIR)/lib/X11/app-defaults
 MAN1DIR = $(ROOTDIR)/man/man1
-HELPDIR = $(ROOTDIR)/setup/$(SUBSYS)/help
-BITDIR = $(ROOTDIR)/setup/bitmaps
+HELPDIR = $(ROOTDIR)/lib/X11/$(SUBSYS)/help
+BITDIR = $(ROOTDIR)/include/X11/bitmaps
 
 #
 # You generally should not edit below this line
@@ -182,7 +182,10 @@
 
 LDFLAGS = $(OPTIMIZEFLAG) $(MACHDEFS)
 LOCAL_LIB = $(LIBROOT)/lib_incl_local/$(MACH)
-LIBS = -lXm -lXt -lX11
+LIBS = -lXm -lXext -lXt -lX11
+.if $(PORTOBJFORMAT) == "elf"
+LIBS+= -Wl,-rpath,$(X11BASE)/lib
+.endif
 SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib
 FULLLIBPATH = $(LIBPATH) $(SFOCLIBPATH) $(MACHLIBPATH)