diff options
| author | Paul Irofti <pirofti@cvs.openbsd.org> | 2009-01-11 21:02:04 +0000 |
|---|---|---|
| committer | Paul Irofti <pirofti@cvs.openbsd.org> | 2009-01-11 21:02:04 +0000 |
| commit | 9751df9f73e035e5fdd544b02f23b9c8598bd9ae (patch) | |
| tree | 9770f540b1474cfaaba20fe20c7974afa62c0bb2 /sys/arch/sparc/conf | |
| parent | 8c73d12e4ebe3d849dd814c8d6532a4256cedda9 (diff) | |
Fix a sed bug in the makefile's depend target.
What happened was that the output of mkdep was fed to a sed expression
that trimmed a bit more than required and also failed to work when
attempting to do make depend with pcc.
Example:
genassym_c.o: /tmp/genassym.whatever ../../../../../sys/param.h \
was changed to:
assym.h: \
but what was intended was:
assym.h: ../../../../../sys/param.h \
For the pcc -M output things were a bit different and after the make
depend the genassym entry would still remain and make would fail. This
affected all platforms except amd64 and sgi.
Okay miod@.
Diffstat (limited to 'sys/arch/sparc/conf')
| -rw-r--r-- | sys/arch/sparc/conf/Makefile.sparc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc index a25a3b44e7c..47036d7a805 100644 --- a/sys/arch/sparc/conf/Makefile.sparc +++ b/sys/arch/sparc/conf/Makefile.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc,v 1.44 2008/04/15 16:01:34 miod Exp $ +# $OpenBSD: Makefile.sparc,v 1.45 2009/01/11 21:02:03 pirofti Exp $ # $NetBSD: Makefile.sparc,v 1.32.4.1 1996/06/12 20:26:32 pk Exp $ # Makefile for OpenBSD @@ -164,7 +164,8 @@ depend:: .depend .endif sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ ${CPPFLAGS} < ${SPARC}/sparc/genassym.cf - @sed -e 's/.*\.o:.* /assym.h: /' < assym.dep >> .depend + @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ + < assym.dep >> .depend @rm -f assym.dep |