summaryrefslogtreecommitdiff
path: root/x11/xforms/patches/patch-ad
blob: 78539cceca6edfc9e6911d39db705d3fac551e02 (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-ad,v 1.3 2002/09/21 00:24:04 jlam Exp $

--- fdesign/Imakefile.orig	Tue Apr  2 11:33:21 2002
+++ fdesign/Imakefile
@@ -47,6 +47,10 @@
 
 OBJS	= $(SRCS:.c=.o)
 
+LDPRELIBS	=
+JPEGLIBLOC	= ${LOCALBASE}/lib
+JPEGLIB		= -L${JPEGLIBLOC} -ljpeg
+
 #if Solaris64Bit
 LDPRELIB	= -L/usr/openwin/lib/sparcv9
 CCENVSETUP	= LD_RUN_PATH=/usr/openwin/lib/sparcv9
@@ -59,7 +63,7 @@
 
 FORMSLIBDIR     = $(TOP)/lib
 FORMSINCDIR     = $(FORMSLIBDIR)       
-FORMSLIB        = -L$(FORMSLIBDIR) -lforms
+FORMSLIB        = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS)
 DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
 
 #if !UseSystemXpm
@@ -69,7 +73,7 @@
 DEPXPMLIB	= $(XPMLIBDIR)/lib/libXpm.a
 XPMINCLUDE	= -I$(XPMINCDIR)
 #else	
-XPMLIB		= -lXpm
+XPMLIB		= -L$(USRLIBDIR) -lXpm
 #endif
 
 EXTRA_INCLUDES  = \
@@ -80,7 +84,7 @@
 		  -Ispec \
 		  -Ixpm \
 		  -I. \
-		  -I/usr/local/include \
+		  -I${LOCALBASE}/include \
 		  /* Don't remove this line */
 
 EXTRA_LIBRARIES	= \