From d4abe404b4ad9a7c913bde37d211be614f27c965 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Mon, 24 Mar 2014 19:00:34 +0100 Subject: [PATCH] pc64: prevent dat.h from getting overwritten by ../pc/dat.h the rule that was used to copy header files from ../pc accidently overwrote dat.h when ../pc/dat.h was updated because it matched on all *.h files that was also found in ../pc directory. change to exact match on $PCHEADERS to prevent this. --- sys/src/9/pc64/mkfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/src/9/pc64/mkfile b/sys/src/9/pc64/mkfile index d3f9e7e5f..696d8cbd7 100644 --- a/sys/src/9/pc64/mkfile +++ b/sys/src/9/pc64/mkfile @@ -85,11 +85,12 @@ install:V: $p$CONF # copies generated by the rule below PCHEADERS=wifi.h uncached.h usbehci.h screen.h etherif.h ethermii.h mp.h io.h ahci.h -&.h: ../pc/&.h +REPCH=`{echo $PCHEADERS | sed 's/\.h//g; s/ /|/g'} +^($REPCH)\.h:R: '../pc/\1.h' cp $prereq . -PCFILES=`{../port/mkfilelist ../pc} -^($PCFILES)\.$O:R: '../pc/\1.c' +REPCC=`{../port/mkfilelist ../pc} +^($REPCC)\.$O:R: '../pc/\1.c' $CC $CFLAGS -I. -. ../pc/$stem1.c <../boot/bootmkfile