$NetBSD: patch-ab,v 1.4 2002/04/17 18:18:53 fredb Exp $ --- demos/Imakefile.orig Mon Apr 1 10:56:26 2002 +++ demos/Imakefile @@ -106,7 +106,9 @@ DEPOBJS = $(DEPSRCS:.c=.o) PROGRAMS = $(DEMOSRCS:.c=) -JPEGLIBLOC = /usr/local/lib +LDPRELIBS = +JPEGLIBLOC = ${BUILDLINK_DIR}/lib +JPEGLIB = -L${JPEGLIBLOC} -ljpeg #if Solaris64Bit LDPRELIB = -L/usr/openwin/lib/sparcv9 @@ -120,7 +122,7 @@ FORMSLIBDIR = $(TOP)/lib FORMSINCDIR = $(FORMSLIBDIR) -FORMSLIB = -L$(FORMSLIBDIR) -lforms +FORMSLIB = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS) DEPFORMSLIB = $(FORMSLIBDIR)/libforms.a #if !UseSystemXpm @@ -130,7 +132,7 @@ DEPXPMLIB = $(XPMLIBDIR)/libXpm.a XPMINCLUDE = -I$(XPMINCDIR) #else -XPMLIB = -lXpm +XPMLIB = -L$(USRLIBDIR) -lXpm #endif EXTRA_INCLUDES = \ @@ -138,7 +140,7 @@ -I$(FORMSINCDIR) \ -Ifd \ -I. \ - -I/usr/local/include \ + -I${BUILDLINK_DIR}/include \ /* Don't remove this line */ EXTRA_LIBRARIES = \