diff --git a/LOG b/LOG index 36e46fbcc1..b10c19fb57 100644 --- a/LOG +++ b/LOG @@ -45,3 +45,10 @@ - liberalized get-mode check for ../mats. it's not our business whether people make their directories group and/or other writeable. 6.ms +- make test now prints the actual relative path to summary in the + "check summary" message, whether invoked from the top-level directory + or from the workarea. + Makefile.in, Makefile-workarea.in +- configure now just uses cat to copy Makefile-workarea.in to $w/workarea, + since the file is presently the same regardless of the configuration. + configure diff --git a/configure b/configure index a806ed25f6..1493aaab76 100755 --- a/configure +++ b/configure @@ -241,7 +241,7 @@ git submodule init && git submodule update || exit 1 sed -e 's/$(workarea)/'$w'/g' makefiles/Makefile.in > Makefile -sed -e 's/$(m)/'$m'/g' makefiles/Makefile-workarea.in > $w/Makefile +cat makefiles/Makefile-workarea.in > $w/Makefile sed -e 's/$(m)/'$m'/g'\ -e 's/$(workarea)/'$w'/g'\ diff --git a/makefiles/Makefile-workarea.in b/makefiles/Makefile-workarea.in index a9f44638a0..300023c49a 100644 --- a/makefiles/Makefile-workarea.in +++ b/makefiles/Makefile-workarea.in @@ -14,6 +14,7 @@ # limitations under the License. MAKEFLAGS += --no-print-directory +PREFIX= build: (cd c ; $(MAKE)) @@ -24,7 +25,7 @@ install: build test: build (cd mats ; $(MAKE) allx) - @echo "test run complete. check mats/summary for errors." + @echo "test run complete. check $(PREFIX)mats/summary for errors." bootfiles: build $(MAKE) -f Mf-boot diff --git a/makefiles/Makefile.in b/makefiles/Makefile.in index 4b4abe338c..8160d23ba5 100644 --- a/makefiles/Makefile.in +++ b/makefiles/Makefile.in @@ -22,7 +22,7 @@ install: (cd $(workarea) && $(MAKE) install) test: - (cd $(workarea) && $(MAKE) test) + (cd $(workarea) && $(MAKE) test PREFIX=$(workarea)/) bootfiles: (cd $(workarea) && $(MAKE) bootfiles)