summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@openbsd.org>2010-05-06 20:58:10 +0000
committernaddy <naddy@openbsd.org>2010-05-06 20:58:10 +0000
commitd633d972181c3317fc85e5d917d061a5a2704c95 (patch)
tree9a7cfeee9e3fa8684b239dce92f249f96fcb6873
parentAdd missing cleandir target (diff)
downloadwireguard-openbsd-d633d972181c3317fc85e5d917d061a5a2704c95.tar.xz
wireguard-openbsd-d633d972181c3317fc85e5d917d061a5a2704c95.zip
Don't try to create /usr/bin; mtree will have taken care of that.
ok kettenis@
-rw-r--r--gnu/usr.bin/cc/c++filt/Makefile6
-rw-r--r--gnu/usr.bin/cc/cc1obj/Makefile6
-rw-r--r--gnu/usr.bin/cc/cc1plus/Makefile8
-rw-r--r--gnu/usr.bin/cc/collect2/Makefile6
4 files changed, 4 insertions, 22 deletions
diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index a9b304faa10..dd27f0f24a6 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.22.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.1.1.1 2009/10/15 20:50:19 robert Exp $
+# $OpenBSD: Makefile,v 1.2 2010/05/06 20:58:10 naddy Exp $
.include <bsd.own.mk>
@@ -17,8 +17,4 @@ CFLAGS+= -DSTANDALONE_DEMANGLER -DVERSION=\"$(GCC_VERSION)\"
DPADD= ${LIBIBERTY}
LDADD= ${LIBIBERTY}
-beforeinstall:
- ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${DIRMODE} \
- ${DESTDIR}${BINDIR}
-
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 8debe674f71..8b6d97a459f 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.28.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.1.1.1 2009/10/15 20:50:19 robert Exp $
+# $OpenBSD: Makefile,v 1.2 2010/05/06 20:58:10 naddy Exp $
.include <bsd.own.mk>
@@ -29,8 +29,4 @@ ${PROG}-checksum.c: ${PROG}-dummy
../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
CLEANFILES+= ${PROG}-checksum.c
-beforeinstall:
- ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${DIRMODE} \
- ${DESTDIR}${BINDIR}
-
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index d7e611ad1a0..628a77773f4 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.39.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.1.1.1 2009/10/15 20:50:20 robert Exp $
+# $OpenBSD: Makefile,v 1.2 2010/05/06 20:58:10 naddy Exp $
.include <bsd.own.mk>
@@ -35,10 +35,4 @@ ${PROG}-checksum.c: ${PROG}-dummy
../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
CLEANFILES+= ${PROG}-checksum.c
-beforeinstall:
-.if !exist(${DESTDIR}${BINDIR})
- ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${DIRMODE} \
- ${DESTDIR}${BINDIR}
-.endif
-
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/collect2/Makefile b/gnu/usr.bin/cc/collect2/Makefile
index 93de4529fc4..bf8ca8df505 100644
--- a/gnu/usr.bin/cc/collect2/Makefile
+++ b/gnu/usr.bin/cc/collect2/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/cc/collect2/Makefile,v 1.9.20.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.1.1.1 2009/10/15 20:50:20 robert Exp $
+# $OpenBSD: Makefile,v 1.2 2010/05/06 20:58:10 naddy Exp $
.include <bsd.own.mk>
@@ -15,8 +15,4 @@ BINDIR= /usr/lib/gcc-lib/${GCC_TARGET}/${BASEVER}
LDADD= ${LIBIBERTY}
-beforeinstall:
- ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${DIRMODE} \
- ${DESTDIR}${BINDIR}
-
.include <bsd.prog.mk>