summaryrefslogtreecommitdiff
path: root/x11/xforms/patches/patch-ab
blob: 5374766b263416db758b1d6ba42a33389a8d39e0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
$NetBSD: patch-ab,v 1.5 2002/09/21 00:24:04 jlam 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	= ${LOCALBASE}/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${LOCALBASE}/include \
 		  /* Don't remove this line */
 
 EXTRA_LIBRARIES	= \