summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2011-05-26 13:52:56 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2011-05-26 13:52:56 +0000
commit77cc0d97d60a5622feaa1da1e899c3eaba75392f (patch)
treeb402949e5d7a935c784724f42372694f63fc10d1 /lib
parent824f39975573bead30ccaad9560519afaf42931f (diff)
remove hack to test and create /usr/lib/pkgconfig/ if needed, it's been six
months since it was introduced so it's safe to assume people have this dir now. ok deraadt@
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/Makefile4
-rw-r--r--lib/libz/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile
index e01d3060d8d..59ef803278b 100644
--- a/lib/libssl/Makefile
+++ b/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/01/21 09:24:45 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2011/05/26 13:52:55 jasper Exp $
SUBDIR=crypto ssl man
PC_FILES=openssl.pc libssl.pc libcrypto.pc
@@ -15,8 +15,6 @@ distribution:
beforeinstall:
/bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR}
- [ -d ${DESTDIR}/usr/lib/pkgconfig/ ] || \
- ${INSTALL} -o root -g ${SHAREGRP} -d ${DESTDIR}/usr/lib/pkgconfig/
.for p in ${PC_FILES}
${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \
-m ${SHAREMODE} ${.OBJDIR}/$p ${DESTDIR}/usr/lib/pkgconfig/
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index ef868e00d31..b55d868abab 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2011/05/04 07:36:38 jasper Exp $
+# $OpenBSD: Makefile,v 1.16 2011/05/26 13:52:55 jasper Exp $
LIB= z
WANTLINT=
@@ -52,8 +52,6 @@ includes:
beforeinstall:
/bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR}
- [ -d ${DESTDIR}/usr/lib/pkgconfig/ ] || \
- ${INSTALL} -o root -g ${SHAREGRP} -d ${DESTDIR}/usr/lib/pkgconfig/
${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \
-m ${SHAREMODE} ${.OBJDIR}/${PC_FILES} ${DESTDIR}/usr/lib/pkgconfig/