--- Imakefile.orig	Mon Jul 17 13:28:19 1995
+++ Imakefile	Fri Oct 26 23:58:56 2007
@@ -20,9 +20,9 @@
 
 SUBDIRS = common Xbr
 
-SYS_LIBRARIES = $(XBRLIB) $(COMMONLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) -lm
+SYS_LIBRARIES = -L${PREFIX}/lib $(XBRLIB) $(COMMONLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) -lm
 
-INCLUDES = $(COMMONINC) $(XBRINC) $(XMINC)
+INCLUDES = $(COMMONINC) $(XBRINC) $(XMINC) -I${PREFIX}/include
 
 SRCS = about.c help.c xtar.c
 OBJS = $(SRCS:.c=.o)
@@ -30,5 +30,5 @@ OBJS = $(SRCS:.c=.o)
 MakeSubdirs($(SUBDIRS))
 ComplexProgramTarget(xtar)
 MakeDirectories(install,$(LIBDIR)/xtar)
-InstallNonExec(xtar.doc, $(LIBDIR)/xtar)
+InstallNonExec(xtar.doc,$(LIBDIR)/xtar)
 InstallAppDefaults(XTar)