From: downsj <downsj@openbsd.org>
Date: Mon, 16 Dec 1996 01:07:22 +0000 (+0000)
Subject: Closer to being correct; set local_prefix as well so it stays out of
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=40fbdce359716181e64b3f6fb39f23ee0d8faf2a;p=openbsd

Closer to being correct; set local_prefix as well so it stays out of
/usr/local.
---

diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index 03d180f9bfb..00d5c1dca23 100644
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.20 1996/11/24 00:43:23 niklas Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.21 1996/12/16 01:07:22 downsj Exp $
 
 MAN=		cccp.1 gcc.1 cp/g++.1 f/g77.1
 MLINKS+=	gcc.1 cc.1
@@ -30,10 +30,12 @@ all:	config.status
 config: .FORCE
 	-rm -f config.cache
 	/bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
-		--prefix=/usr --gxx-include=${GPP_INC_DIR} ${GCCARCH}
+		--prefix=/usr --local-prefix=/usr \
+		--gxx-include=${GPP_INC_DIR} ${GCCARCH}
 config.status:
 	/bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
-		--prefix=/usr --gxx-include=${GPP_INC_DIR} ${GCCARCH}
+		--prefix=/usr --local-prefix=/usr \
+		--gxx-include=${GPP_INC_DIR} ${GCCARCH}
 
 install:	maninstall
 	${MAKE} ${GNUCFLAGS} prefix=${DESTDIR}/usr \
@@ -47,7 +49,11 @@ install:	maninstall
 	if [ -e ${DESTDIR}/usr/lib/libf2c.a ]; then \
 		chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/lib/libf2c.a; \
 		chmod 444 ${DESTDIR}/usr/lib/libf2c.a; \
-	fi; \
+	fi
+	if [ -e ${DESTDIR}/usr/include/f2c.h ]; then \
+		chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/f2c.h; \
+		chmod 444 ${DESTDIR}/usr/include/f2c.h; \
+	fi
 	__target=`sed -n '/^target=/s/target=//p' Makefile`; \
 	__version=`sed -n '/^version=/s/version=//p' Makefile`; \
 	ln -fs /usr/lib/gcc-lib/$$__target/$$__version/cpp \
diff --git a/gnu/usr.bin/gcc/f2c-install-ok b/gnu/usr.bin/gcc/f2c-install-ok
deleted file mode 100644
index e69de29bb2d..00000000000