diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1996-12-16 01:07:24 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1996-12-16 01:07:24 +0000 |
| commit | e50521412b4ef3702e933286a697806f24935eaf (patch) | |
| tree | 2584c0059e471d0708e2c2c3a3778fdd6ed5d99f /gnu/usr.bin | |
| parent | 552dc8411e376c18560aef29fb764992a36a8727 (diff) | |
Closer to being correct; set local_prefix as well so it stays out of
/usr/local.
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/gcc/Makefile.bsd-wrapper | 14 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/f2c-install-ok | 0 |
2 files changed, 10 insertions, 4 deletions
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 --- a/gnu/usr.bin/gcc/f2c-install-ok +++ /dev/null |