summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornatano <>2016-09-04 09:54:25 +0000
committernatano <>2016-09-04 09:54:25 +0000
commita381a074cb5469c83338ad68a1559147fd5f5048 (patch)
treeb34589b189436b97aec534cf1949f658b043065e /src
parentd171e54b2d138aaf6be8090ee89531d5510f57f7 (diff)
downloadopenbsd-a381a074cb5469c83338ad68a1559147fd5f5048.tar.gz
openbsd-a381a074cb5469c83338ad68a1559147fd5f5048.tar.bz2
openbsd-a381a074cb5469c83338ad68a1559147fd5f5048.zip
only regen pkg-config files when required; ok jasper
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/Makefile10
-rw-r--r--src/lib/libssl/Makefile8
2 files changed, 10 insertions, 8 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index afe2db0cf6..9a0d7cc22f 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.2 2016/09/03 12:42:46 beck Exp $ 1# $OpenBSD: Makefile,v 1.3 2016/09/04 09:54:25 natano Exp $
2 2
3LIB= crypto 3LIB= crypto
4 4
@@ -438,12 +438,12 @@ distribution:
438 ${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \ 438 ${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
439 ${.CURDIR}/x509v3.cnf ${DESTDIR}/etc/ssl/x509v3.cnf 439 ${.CURDIR}/x509v3.cnf ${DESTDIR}/etc/ssl/x509v3.cnf
440 440
441beforeinstall: 441${PC_FILES}: opensslv.h
442 /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR} 442 /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR}
443.for p in ${PC_FILES} 443
444beforeinstall: ${PC_FILES}
444 ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \ 445 ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \
445 -m ${SHAREMODE} ${.OBJDIR}/$p ${DESTDIR}/usr/lib/pkgconfig/ 446 -m ${SHAREMODE} ${.OBJDIR}/${PC_FILES} ${DESTDIR}/usr/lib/pkgconfig/
446.endfor
447 447
448.include <bsd.prog.mk> 448.include <bsd.prog.mk>
449.include <bsd.subdir.mk> 449.include <bsd.subdir.mk>
diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
index 16d08731eb..f442bd90bb 100644
--- a/src/lib/libssl/Makefile
+++ b/src/lib/libssl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.20 2016/09/03 12:42:42 beck Exp $ 1# $OpenBSD: Makefile,v 1.21 2016/09/04 09:54:25 natano Exp $
2 2
3SUBDIR= man 3SUBDIR= man
4PC_FILES=openssl.pc libssl.pc 4PC_FILES=openssl.pc libssl.pc
@@ -48,10 +48,12 @@ includes:
48 48
49.include <bsd.lib.mk> 49.include <bsd.lib.mk>
50 50
51beforeinstall: 51${PC_FILES}: ${.CURDIR}/../libcrypto/opensslv.h
52 /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR}
53
54beforeinstall: ${PC_FILES}
52 nm -o lib${LIB}.a | egrep -w 'printf|fprintf' && \ 55 nm -o lib${LIB}.a | egrep -w 'printf|fprintf' && \
53 (echo please fix stdio usage in this library; false) || true 56 (echo please fix stdio usage in this library; false) || true
54 /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR}
55.for p in ${PC_FILES} 57.for p in ${PC_FILES}
56 ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \ 58 ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \
57 -m ${SHAREMODE} ${.OBJDIR}/$p ${DESTDIR}/usr/lib/pkgconfig/ 59 -m ${SHAREMODE} ${.OBJDIR}/$p ${DESTDIR}/usr/lib/pkgconfig/