diff options
| -rw-r--r-- | gnu/usr.bin/gcc/Makefile.bsd-wrapper | 9 | ||||
| -rw-r--r-- | usr.bin/cpp/Makefile | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper index f4d6b4a5274..2e14c43345e 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.16 1996/08/25 15:39:13 downsj Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.17 1996/08/26 21:25:20 niklas Exp $ MAN= cccp.1 gcc.1 cp/g++.1 f/g77.1 MLINKS+= gcc.1 cc.1 @@ -38,8 +38,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; \ + __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 \ + ${DESTDIR}/usr/libexec clean cleandir: rm -f ${CLEANFILES} diff --git a/usr.bin/cpp/Makefile b/usr.bin/cpp/Makefile index 36426247def..c61ba467574 100644 --- a/usr.bin/cpp/Makefile +++ b/usr.bin/cpp/Makefile @@ -1,13 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 1996/06/26 05:32:24 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 1996/08/26 21:25:22 niklas Exp $ NOMAN= beforeinstall: install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/cpp.sh ${DESTDIR}${BINDIR}/cpp - if [ `cc -print-libgcc-file-name` != /usr/lib/libgcc.a ]; then \ - (cd ${DESTDIR}/usr/libexec; rm -f cpp; \ - ln -s `cc -print-libgcc-file-name | sed -e 's/libgcc\.a/cpp/'` cpp); \ - fi .include <bsd.prog.mk> |