$NetBSD: patch-aa,v 1.4 1999/01/19 17:22:11 frueauf Exp $ --- fig2dev/Imakefile.orig Wed Jul 1 01:52:50 1998 +++ fig2dev/Imakefile Tue Jan 19 18:07:15 1999 @@ -31,7 +31,7 @@ XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled XCOMM and installed xfig. This will be made automatic in the future. -XFIGLIBDIR = /usr/local/lib/X11/xfig +XFIGLIBDIR = $(PROJECTROOT)/lib/X11/xfig XCOMM If your system has the strerror() function (doesn't have sys_errlist) then XCOMM comment out NEED_STRERROR with an XCOMM comment. @@ -57,7 +57,7 @@ XCOMM You need version 3.4c of the XPM package. XCOMM -XCOMM #define USEXPM +#define USEXPM XCOMM For Linux machines or any machines that have a separate library for XCOMM the database management routines, uncomment the following line. @@ -136,7 +136,7 @@ #ifdef USEXPM DUSEXPM = -DUSE_XPM XPMLIBDIR = $(USRLIBDIR) -XPMINC = -I$(INCDIR) +XPMINC = -I$(INCDIR)/X11 XPMLIBS = -L$(XPMLIBDIR) -lXpm -lX11 XPMRGB = XPMRGB=$(LIBDIR)/rgb XPMDBM = $(USE_NDBM) @@ -153,9 +153,9 @@ DUSEJPEG = -DUSE_JPEG #ifdef USEINSTALLEDJPEG -JPEGLIBDIR = /usr/local/lib -JPEGINCDIR = /usr/include/X11 -JPEGLIB = -L$(JPEGLIBDIR) -ljpeg +JPEGLIBDIR = $(LOCALBASE)/lib +JPEGINCDIR = $(LOCALBASE)/include +JPEGLIB = -Wl,-R$(JPEGLIBDIR) -L$(JPEGLIBDIR) -ljpeg #else XCOMM this is relative to this directory (transfig/fig2dev) JPEGLIBDIR = ../../jpeg-6a