- 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

original commit: 1d438978dfedef9a47839b3ee302196aa5d8eda1
This commit is contained in:
dybvig 2016-04-27 22:26:08 -04:00
parent e2844450a7
commit 0187d2bf4e
4 changed files with 11 additions and 3 deletions

7
LOG
View File

@ -45,3 +45,10 @@
- liberalized get-mode check for ../mats. it's not our business whether - liberalized get-mode check for ../mats. it's not our business whether
people make their directories group and/or other writeable. people make their directories group and/or other writeable.
6.ms 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

2
configure vendored
View File

@ -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/$(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'\ sed -e 's/$(m)/'$m'/g'\
-e 's/$(workarea)/'$w'/g'\ -e 's/$(workarea)/'$w'/g'\

View File

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
MAKEFLAGS += --no-print-directory MAKEFLAGS += --no-print-directory
PREFIX=
build: build:
(cd c ; $(MAKE)) (cd c ; $(MAKE))
@ -24,7 +25,7 @@ install: build
test: build test: build
(cd mats ; $(MAKE) allx) (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 bootfiles: build
$(MAKE) -f Mf-boot $(MAKE) -f Mf-boot

View File

@ -22,7 +22,7 @@ install:
(cd $(workarea) && $(MAKE) install) (cd $(workarea) && $(MAKE) install)
test: test:
(cd $(workarea) && $(MAKE) test) (cd $(workarea) && $(MAKE) test PREFIX=$(workarea)/)
bootfiles: bootfiles:
(cd $(workarea) && $(MAKE) bootfiles) (cd $(workarea) && $(MAKE) bootfiles)