Module Name: src
Committed By: agc
Date: Wed Sep 1 06:02:58 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/netpgp: Makefile
Log Message:
Fix a problem reported by moof whereby the build would fail on Sun2 due
to shared library lossage on the Sun2 platform. Sorry, I thought that the
change had already been made, but it was just to netpgpkeys' Makefile.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/netpgp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/netpgp/Makefile:1.2 src/crypto/external/bsd/netpgp/netpgp/Makefile:1.3
--- src/crypto/external/bsd/netpgp/netpgp/Makefile:1.2 Tue Jun 9 00:56:15 2009
+++ src/crypto/external/bsd/netpgp/netpgp/Makefile Wed Sep 1 06:02:58 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/06/09 00:56:15 agc Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/01 06:02:58 agc Exp $
.include <bsd.own.mk>
@@ -11,6 +11,10 @@
LDADD+= -L${LIBNETPGPDIR} -lnetpgp
DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+LIBMJDIR!= cd ${.CURDIR}/../libmj && ${PRINTOBJDIR}
+LDADD+= -L${LIBMJDIR} -lmj
+DPADD+= ${LIBMJDIR}/libmj.a
+
LDADD+= -lcrypto -lz -lbz2
DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
