summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/Makefile
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-03-30 15:30:11 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-03-30 15:30:11 +0000
commitf6ab5cd567eae5b6537564ff2a13e61b444e8d59 (patch)
tree16b8bdbdcda3062516b1b84ec4b0f900d17ab120 /gnu/usr.bin/Makefile
parentcf6ba41bd10581a3e33ca72326b838f86f9191d1 (diff)
From NetBSD: merge of 960317
Diffstat (limited to 'gnu/usr.bin/Makefile')
-rw-r--r--gnu/usr.bin/Makefile21
1 files changed, 6 insertions, 15 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 55da28aa408..bb5064b7914 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,24 +1,15 @@
-# $NetBSD: Makefile,v 1.27 1995/12/07 07:26:32 phil Exp $
+# $OpenBSD: Makefile,v 1.6 1996/03/30 15:29:23 niklas Exp $
+# $NetBSD: Makefile,v 1.34 1996/02/18 12:28:15 pk Exp $
-SUBDIR+= bc cpio cvs dc diff diff3 gawk gcc grep groff
+SUBDIR+= bc cpio cvs dc diff diff3 gawk grep groff
SUBDIR+= gzip rcs sdiff send-pr sort tar texinfo
# some ports don't use the tool chain in /usr/src
-.if (${MACHINE_ARCH} != "alpha") && (${MACHINE_ARCH} != "mips") && \
- (${MACHINE_ARCH} != "vax") && (${MACHINE_ARCH} != "ns32k")
+.if (${MACHINE_ARCH} != "alpha") && (${MACHINE_ARCH} != "mips")
SUBDIR+= gas gdb ld
.endif
-
-# ns32k and vax wants newer gcc
-.if (${MACHINE_ARCH} == "ns32k") || (${MACHINE_ARCH} == "vax")
-SUBDIR+= gas gcc gdb ld
-.endif
-
-# XXX alpha still needs the /usr/bin/cpp script.
-.if (${MACHINE_ARCH} == "alpha")
-afterinstall:
- install -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \
- $(.CURDIR)/gcc2/cpp/usr.bin.cpp.sh $(DESTDIR)/usr/bin/cpp
+.if ${MACHINE_ARCH} != "alpha"
+SUBDIR+= gcc
.endif
.include <bsd.subdir.mk>