From 9751df9f73e035e5fdd544b02f23b9c8598bd9ae Mon Sep 17 00:00:00 2001 From: Paul Irofti Date: Sun, 11 Jan 2009 21:02:04 +0000 Subject: 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@. --- sys/arch/armish/conf/Makefile.armish | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sys/arch/armish/conf/Makefile.armish') diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish index a268703bdf7..b9782cffd15 100644 --- a/sys/arch/armish/conf/Makefile.armish +++ b/sys/arch/armish/conf/Makefile.armish @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armish,v 1.9 2008/04/12 21:04:16 miod Exp $ +# $OpenBSD: Makefile.armish,v 1.10 2009/01/11 21:02:03 pirofti Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -173,7 +173,8 @@ depend:: .depend cat ${ARM}/arm/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ ${CPPFLAGS} - @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 -- cgit v1.2.3