diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-03-15 06:01:41 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-03-15 06:01:41 +0000 |
| commit | 66d51a268152bfc815acd05129d06950ba3a591b (patch) | |
| tree | bf2e6be277c47ec74fb3ed84ff6b64c6239a2447 | |
| parent | Rewrite receive filter handling and ioctl bits. (diff) | |
| download | wireguard-openbsd-66d51a268152bfc815acd05129d06950ba3a591b.tar.xz wireguard-openbsd-66d51a268152bfc815acd05129d06950ba3a591b.zip | |
Enter more directories, and put the conditional down below. This is
for obj dirs...
| -rw-r--r-- | usr.bin/Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/strings/Makefile | 5 | ||||
| -rw-r--r-- | usr.bin/strip/Makefile | 7 |
3 files changed, 12 insertions, 8 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 37f60b6b820..a37676ce386 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.128 2013/03/10 17:55:54 nicm Exp $ +# $OpenBSD: Makefile,v 1.129 2013/03/15 06:01:41 deraadt Exp $ .include <bsd.own.mk> @@ -22,7 +22,7 @@ SUBDIR= apply apropos ar arch asa asn1_compile at aucat audioctl awk banner \ readlink renice rev rpcgen rpcinfo rs rsh rup ruptime rusers rwall \ rwho sdiff script sed sendbug shar showmount skey \ skeyaudit skeyinfo skeyinit sndiod \ - sort spell split sqlite3 ssh stat su systat \ + sort spell split sqlite3 ssh stat strip strings su systat \ sudo tail talk tcopy tcpbench tee telnet tftp tic tip time \ tmux top touch tput tr true tset tsort tty usbhidaction usbhidctl \ ul uname unexpand unifdef uniq units \ @@ -34,8 +34,4 @@ SUBDIR= apply apropos ar arch asa asn1_compile at aucat audioctl awk banner \ SUBDIR+=ypcat ypmatch ypwhich .endif -.if (${ELF_TOOLCHAIN:L} == "no") -SUBDIR+= strip strings -.endif - .include <bsd.subdir.mk> diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile index dfb377e7fd2..fb058588f94 100644 --- a/usr.bin/strings/Makefile +++ b/usr.bin/strings/Makefile @@ -1,5 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2013/03/15 06:01:42 deraadt Exp $ +.include <bsd.own.mk> +.if (${ELF_TOOLCHAIN:L} == "no") PROG= strings +.endif .include <bsd.prog.mk> diff --git a/usr.bin/strip/Makefile b/usr.bin/strip/Makefile index c7390379843..67f489ee51b 100644 --- a/usr.bin/strip/Makefile +++ b/usr.bin/strip/Makefile @@ -1,4 +1,7 @@ -# $OpenBSD: Makefile,v 1.11 2004/07/12 10:44:11 miod Exp $ +# $OpenBSD: Makefile,v 1.12 2013/03/15 06:01:42 deraadt Exp $ + +.include <bsd.own.mk> +.if (${ELF_TOOLCHAIN:L} == "no") TARGET_MACHINE_ARCH?= ${MACHINE_ARCH} @@ -46,4 +49,6 @@ realinstall: chmod ${BINMODE} ${DESTDIR}${BINDIR}/strip -if [ "${INSTALL_COPY}" = "" ]; then rm -f ${STRIP}; fi +.endif + .include <bsd.prog.mk> |