Link against libnetpbm, since that's the only library installed

by the netpbm package, instead of the previously existing libraries.
This commit is contained in:
wiz 2004-04-24 22:06:27 +00:00
parent 419a7941e9
commit 1b31a1b7cd
3 changed files with 7 additions and 7 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.3 2003/09/25 11:58:33 tron Exp $
$NetBSD: distinfo,v 1.4 2004/04/24 22:06:27 wiz Exp $
SHA1 (urt-3.1b.tar.Z) = 370b19c9e7019a7258754e7494b7ae2d7fe138ac
Size (urt-3.1b.tar.Z) = 1016405 bytes
@ -8,7 +8,7 @@ SHA1 (urt-img.tar) = 0bdca907616ccee15ae1915af40fb370a705954f
Size (urt-img.tar) = 1851392 bytes
SHA1 (urt-3.1b-3.1b1.patch) = 27aefd80b480af298fe4f9542a2efbddba8a174b
Size (urt-3.1b-3.1b1.patch) = 18264 bytes
SHA1 (patch-aa) = 6d3a514a84559a4bb9c21ccc88d1faad9aee49fc
SHA1 (patch-aa) = f7be02075737fc19750c07c04cfa444e0baf020b
SHA1 (patch-ab) = 8f8e50f6ccdd80afaa034af998e47284e7788398
SHA1 (patch-ac) = 5b4d6c910f282e1cb16fd29c7956b40a335491b1
SHA1 (patch-ad) = 764806da7b3b4798ef2627df376db8dcc7c5e97f
@ -23,7 +23,7 @@ SHA1 (patch-al) = f3bb1c6a8d2f0189014d004146d2612e39ad55f9
SHA1 (patch-am) = cc9a4db1a95257da41f66b14c39fabfe9618fcb2
SHA1 (patch-an) = ee6bf051757137448a5d1a002f03fa608900e430
SHA1 (patch-ao) = 02080e1cc86651bbad9649d703c7f9c9dd9e203a
SHA1 (patch-ap) = 1d8ce915c6db36a622c32bc99d15d2499fa30b33
SHA1 (patch-ap) = f9b5f52952599f156447840ebb325d13c1b93663
SHA1 (patch-aq) = 48c32f85cca8283ecd475ccf4c603ac099b9a253
SHA1 (patch-ar) = 728e652142bc906dfbad7ee73a928b19b43d9a06
SHA1 (patch-as) = 282b6917daccc7bbfee600b8ea6dbeea8bf6fa86

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.5 2003/09/25 11:58:33 tron Exp $
$NetBSD: patch-aa,v 1.6 2004/04/24 22:06:27 wiz Exp $
--- config/urt.orig 1992-07-15 21:47:15.000000000 +0200
+++ config/urt 2003-09-25 13:55:06.000000000 +0200
@ -143,7 +143,7 @@ $NetBSD: patch-aa,v 1.5 2003/09/25 11:58:33 tron Exp $
-LIBPBMPLUS = $(PBMDIR)/ppm/libppm.a $(PBMDIR)/pgm/libpgm.a \
- $(PBMDIR)/pbm/libpbm.a
+INCPBMPLUS = -I$(PBMDIR)/include
+LIBPBMPLUS = -L$(PBMDIR)/lib -Wl,-R$(PBMDIR)/lib -lppm -lpgm -lpbm
+LIBPBMPLUS = -L$(PBMDIR)/lib -Wl,-R$(PBMDIR)/lib -lnetpbm
#endif
#ifdef SUNRASTER|SUNTOOLS|TAAC1

View file

@ -1,11 +1,11 @@
$NetBSD: patch-ap,v 1.2 2001/03/05 16:43:59 wiz Exp $
$NetBSD: patch-ap,v 1.3 2004/04/24 22:06:27 wiz Exp $
--- /dev/null Fri Feb 16 09:53:47 2001
+++ lib.mk Fri Feb 16 09:53:24 2001
@@ -0,0 +1,50 @@
+PBMDIR= ${LOCALBASE}
+
+INCPBMPLUS = -I$(PBMDIR)/include
+LIBPBMPLUS = -L$(PBMDIR)/lib -Wl,-R$(PBMDIR)/lib -lppm -lpgm -lpbm
+LIBPBMPLUS = -L$(PBMDIR)/lib -Wl,-R$(PBMDIR)/lib -lnetpbm
+
+INCTIFF = -I${LOCALBASE}/include
+LIBTIFF = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -ltiff -ljpeg -lz