diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-11-28 08:06:02 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-11-28 08:06:02 +0000 |
| commit | fdecf859371372ee0af0224891385c055068e20c (patch) | |
| tree | 63ff959f45c2aef664e2e799ade81577119f1989 | |
| parent | b3432f3f1a456f434997d9b5fbd0ad10b9d42225 (diff) | |
Including ../../Makefile.inc was loop when npppd/obj is not a symbolic link.
Delete Makefile.inc and define BINDIR at npppd/Makefile directly.
| -rw-r--r-- | usr.sbin/npppd/Makefile.inc | 8 | ||||
| -rw-r--r-- | usr.sbin/npppd/npppd/Makefile | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/usr.sbin/npppd/Makefile.inc b/usr.sbin/npppd/Makefile.inc deleted file mode 100644 index cf6e9603b5c..00000000000 --- a/usr.sbin/npppd/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: Makefile.inc,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ -# $Id: Makefile.inc,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ - -.include <bsd.own.mk> - -.if exists(${.CURDIR}/../../Makefile.inc) -.include "../../Makefile.inc" -.endif diff --git a/usr.sbin/npppd/npppd/Makefile b/usr.sbin/npppd/npppd/Makefile index 236ba4df568..8c894d22c3d 100644 --- a/usr.sbin/npppd/npppd/Makefile +++ b/usr.sbin/npppd/npppd/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.14 2012/11/13 17:10:40 yasuoka Exp $ +# $OpenBSD: Makefile,v 1.15 2012/11/28 08:06:01 yasuoka Exp $ NPPPD_COMMON_DIR= ${.CURDIR}/../common +BINDIR= /usr/sbin PROG= npppd MAN= npppd.8 npppd.conf.5 npppd-users.5 CPPFLAGS+= -I${NPPPD_COMMON_DIR} -I${.CURDIR} |