pkgsrc/x11/xforms/patches/patch-ac
fredb e11e21b972 Make the included programs and demos link against the package's "forms"
shared library, rather than any previously installed one.
2002-04-17 18:18:53 +00:00

37 lines
879 B
Text

$NetBSD: patch-ac,v 1.2 2002/04/17 18:18:53 fredb Exp $
--- fd2ps/Imakefile.orig Tue Apr 2 11:34:02 2002
+++ fd2ps/Imakefile
@@ -30,9 +30,13 @@
OBJS = $(SRCS:.c=.o)
+LDPRELIBS =
+JPEGLIBLOC = ${BUILDLINK_DIR}/lib
+JPEGLIB = -L${JPEGLIBLOC} -ljpeg
+
FORMSLIBDIR = $(TOP)/lib
FORMSINCDIR = $(FORMSLIBDIR)
-FORMSLIB = -L$(FORMSLIBDIR) -lforms
+FORMSLIB = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS)
DEPFORMSLIB = $(FORMSLIBDIR)/libforms.a
#if !UseSystemXpm
@@ -41,6 +45,8 @@
XPMLIB = -L$(XPMLIBDIR)/lib -lXpm
DEPXPMLIB = $(XPMLIBDIR)/lib/libXpm.a
XPMINCLUDE = -I$(XPMINCDIR)
+#else
+XPMLIB = -L$(USRLIBDIR) -lXpm
#endif
#if Solaris64Bit
@@ -55,7 +61,7 @@
-Ispec \
-Ixpm \
-I. \
- -I/usr/local/include \
+ -I${BUILDLINK_DIR}/include \
/* Don't remove this line */
EXTRA_LIBRARIES = \