diff options
| author |   espie <espie@openbsd.org> | 2012-06-11 10:16:46 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2012-06-11 10:16:46 +0000 |
| commit | 6fde26d81e82bc4eb232462d89d67f5e4c2efaa0 (patch) | |
| tree | 7a78be0893ca6997b76a435913b18d525dea925e | |
| parent | title should say we document modules here. (diff) | |
| download | wireguard-openbsd-6fde26d81e82bc4eb232462d89d67f5e4c2efaa0.tar.xz wireguard-openbsd-6fde26d81e82bc4eb232462d89d67f5e4c2efaa0.zip | |
move PkgConfig.pm where it belongs
as requested by matthieu@, ok jasper@, miod@, matthieu@
| -rw-r--r-- | usr.bin/pkg-config/Makefile | 13 | ||||
| -rw-r--r-- | usr.bin/pkg-config/OpenBSD/PkgConfig.pm (renamed from usr.sbin/pkg_add/OpenBSD/PkgConfig.pm) | 2 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/Makefile | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/usr.bin/pkg-config/Makefile b/usr.bin/pkg-config/Makefile index f465698cd39..3a58f86a239 100644 --- a/usr.bin/pkg-config/Makefile +++ b/usr.bin/pkg-config/Makefile @@ -1,9 +1,16 @@ -# $OpenBSD: Makefile,v 1.4 2006/11/28 00:48:08 ckuethe Exp $ +# $OpenBSD: Makefile,v 1.5 2012/06/11 10:16:46 espie Exp $ MAN=pkg-config.1 -beforeinstall: - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ +LIBDIR = /usr/libdata/perl5/OpenBSD + +realinstall: + ${INSTALL} -d -o ${LIBOWN} -g ${LIBGRP} -m ${DIRMODE} \ + ${DESTDIR}${LIBDIR} + ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${.CURDIR}/OpenBSD/PkgConfig.pm ${DESTDIR}${LIBDIR} + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/pkg-config ${DESTDIR}${BINDIR}/pkg-config +NOPROG = .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm b/usr.bin/pkg-config/OpenBSD/PkgConfig.pm index f9d412b427c..a5eeec0d488 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm +++ b/usr.bin/pkg-config/OpenBSD/PkgConfig.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PkgConfig.pm,v 1.19 2011/06/21 07:18:35 jasper Exp $ +# $OpenBSD: PkgConfig.pm,v 1.1 2012/06/11 10:16:46 espie Exp $ # # Copyright (c) 2006 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/Makefile b/usr.sbin/pkg_add/Makefile index 6acac7668ef..ef23b485b2f 100644 --- a/usr.sbin/pkg_add/Makefile +++ b/usr.sbin/pkg_add/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.72 2012/01/15 14:16:16 espie Exp $ +# $OpenBSD: Makefile,v 1.73 2012/06/11 10:16:46 espie Exp $ .include <bsd.own.mk> @@ -46,7 +46,6 @@ PACKAGES= \ OpenBSD/PkgAdd.pm \ OpenBSD/PkgCfl.pm \ OpenBSD/PkgCheck.pm \ - OpenBSD/PkgConfig.pm \ OpenBSD/PkgCreate.pm \ OpenBSD/PkgDelete.pm \ OpenBSD/PkgInfo.pm \ |