--- Makefile.orig	Fri Jan 17 20:22:35 1997
+++ Makefile	Fri Apr 23 18:28:41 1999
@@ -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)/info
+BITDIR = $(ROOTDIR)/include/X11/bitmaps
 
 #
 # You generally should not edit below this line
@@ -176,13 +176,16 @@
 
 RM = rm -f
 
-CFLAGS = $(OPTIMIZEFLAG) $(SYSDEFS) $(FULLINCLPATH)
+CFLAGS += $(OPTIMIZEFLAG) $(SYSDEFS) $(FULLINCLPATH)
 
 MALLOC =
 
 LDFLAGS = $(OPTIMIZEFLAG) $(MACHDEFS)
 LOCAL_LIB = $(LIBROOT)/lib_incl_local/$(MACH)
-LIBS = -lXm -lXt -lX11
+LIBS = -lXm -lXext -lXt -lX11 ${MOTIFLIB}
+.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)