Mon Jul 20 15:46:51 2009 UTC ()
Use the correct libcrypto.


(christos)
diff -r1.3 -r1.4 src/external/bsd/fetch/lib/Makefile
cvs diff -r1.3 -r1.4 src/external/bsd/fetch/lib/Makefile (switch to unified diff)

--- src/external/bsd/fetch/lib/Makefile 2009/05/28 10:44:29 1.3
+++ src/external/bsd/fetch/lib/Makefile 2009/07/20 15:46:51 1.4
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD 1# $NetBSD
2 2
3LIB= fetch 3LIB= fetch
4SRCS= fetch.c common.c ftp.c http.c file.c 4SRCS= fetch.c common.c ftp.c http.c file.c
5DPSRCS= ftperr.h httperr.h 5DPSRCS= ftperr.h httperr.h
6INCS= fetch.h 6INCS= fetch.h
7INCSDIR= /usr/include 7INCSDIR= /usr/include
8MAN= fetch.3 8MAN= fetch.3
9CLEANFILES= ftperr.h httperr.h 9CLEANFILES= ftperr.h httperr.h
10 10
11.include <bsd.init.mk> 11.include <bsd.init.mk>
12 12
13CPPFLAGS+= -I. 13CPPFLAGS+= -I.
14CPPFLAGS+= -DNETBSD  14CPPFLAGS+= -DNETBSD
15CPPFLAGS+= -DFTP_COMBINE_CWDS 15CPPFLAGS+= -DFTP_COMBINE_CWDS
16CPPFLAGS+= -DINET6 16CPPFLAGS+= -DINET6
17 17
18.if (${MKCRYPTO} != "no") 18.if (${MKCRYPTO} != "no")
19CPPFLAGS+= -DWITH_SSL 19CPPFLAGS+= -DWITH_SSL
20 20
21LDADD= -lssl -lcrypto 21LDADD= -lssl -lcrypto
22 22
23LIBDPLIBS+= ssl ${NETBSDSRCDIR}/lib/libssl \ 23LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl \
24 crypto ${NETBSDSRCDIR}/lib/libcrypto 24 crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
25.endif 25.endif
26 26
27CLEANFILES+= ftperr.h httperr.h 27CLEANFILES+= ftperr.h httperr.h
28 28
29.PATH: ${LIBFETCHDIR} 29.PATH: ${LIBFETCHDIR}
30 30
31ftperr.h: ${LIBFETCHDIR}/ftp.errors ${LIBFETCHDIR}/errlist.sh 31ftperr.h: ${LIBFETCHDIR}/ftp.errors ${LIBFETCHDIR}/errlist.sh
32 ${HOST_SH} ${LIBFETCHDIR}/errlist.sh ftp_errlist FTP \ 32 ${HOST_SH} ${LIBFETCHDIR}/errlist.sh ftp_errlist FTP \
33 ${LIBFETCHDIR}/ftp.errors > ${.TARGET} 33 ${LIBFETCHDIR}/ftp.errors > ${.TARGET}
34 34
35httperr.h: ${LIBFETCHDIR}/http.errors ${LIBFETCHDIR}/errlist.sh 35httperr.h: ${LIBFETCHDIR}/http.errors ${LIBFETCHDIR}/errlist.sh
36 ${HOST_SH} ${LIBFETCHDIR}/errlist.sh http_errlist HTTP \ 36 ${HOST_SH} ${LIBFETCHDIR}/errlist.sh http_errlist HTTP \
37 ${LIBFETCHDIR}/http.errors > ${.TARGET} 37 ${LIBFETCHDIR}/http.errors > ${.TARGET}
38 38
39.include <bsd.lib.mk> 39.include <bsd.lib.mk>