freebsd-ports/x11-toolkits/xforms/files/patch-ab
Mike Heffner 2abdf6df7d Fix build for people who have xforms-1.0_1,1 already installed, by
linking against the correct library.

PR:		ports/43842
2002-10-09 00:41:26 +00:00

49 lines
1.0 KiB
Plaintext

--- fdesign/Imakefile.orig Sun Oct 6 23:19:19 2002
+++ fdesign/Imakefile Sun Oct 6 23:20:13 2002
@@ -78,6 +78,8 @@
INCDIR = XFormsNonstandardInstallDir/include
#endif
+EXTRA_LDOPTIONS = $(FORMSLIB)
+
EXTRA_INCLUDES = \
$(SNPINC) \
-I$(BUILDINCDIR) \
--- demos/Imakefile.orig Fri Sep 27 16:11:45 2002
+++ demos/Imakefile Tue Oct 8 18:33:33 2002
@@ -97,6 +97,9 @@
DEPOBJS = $(DEPSRCS:.c=.o)
PROGRAMS = $(DEMOSRCS:.c=)
+JPEGLIBLOC = JpegLibLoc
+JPEGLIB = -L$(JPEGLIBLOC) -ljpeg
+
#if Solaris64Bit
LDPRELIB = -L/usr/openwin/lib/sparcv9 -L/usr/local/lib/sparcv9
CCENVSETUP = LD_RUN_PATH=/usr/openwin/lib/sparcv9
@@ -125,6 +128,10 @@
DEPSNPLIB = $(SNPLIBDIR)/libformssnp.a
#endif
+EXTRA_LDOPTIONS = $(FORMSLIB) \
+ $(IMAGELIB) \
+ $(SNPLIB)
+
EXTRA_INCLUDES = \
$(SNPINC) \
-I$(BUILDINCDIR) \
@@ -138,12 +145,9 @@
EXTRA_LIBRARIES = \
$(STATIC) \
- $(IMAGELIB) \
- $(FORMSLIB) \
$(XPMLIB) \
- $(SNPLIB) \
$(UNSTATIC) \
- $(JPEG) \
+ $(JPEGLIB) \
-lm
EXTRA_DEFINES =