From 90a20f8ec00d5eed74bed3577e35704d0f90aea0 Mon Sep 17 00:00:00 2001 From: Jan Vrany Date: Mon, 4 Dec 2023 18:33:07 +0000 Subject: [PATCH] Update makefiles after MachineArithmetic moved packages to `src` directory MachineArithmetic commit 2eab9386 "Move smalltalk sources to `src` directory" moved all packages into `src` subdirectory. This commit updates makefiles to reflect this change. --- pharo/GNUmakefile | 2 +- stx/GNUmakefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pharo/GNUmakefile b/pharo/GNUmakefile index 77c9e8e..78e7150 100644 --- a/pharo/GNUmakefile +++ b/pharo/GNUmakefile @@ -32,7 +32,7 @@ build: prereq $(PROJECT).image $(PROJECT).image: ../src/*/*.st $(call pharo-copy-image, $(PHARO_IMAGE), $@) - $(call pharo-load-local, $@, MachineArithmetic,$(MACHINEARITHMETIC_DIR)) + $(call pharo-load-local, $@, MachineArithmetic,$(MACHINEARITHMETIC_DIR)/src) $(call pharo-load-local, $@, ArchC, ../src) run: build diff --git a/stx/GNUmakefile b/stx/GNUmakefile index 2f818f8..1a651d5 100644 --- a/stx/GNUmakefile +++ b/stx/GNUmakefile @@ -33,13 +33,13 @@ build: prereq run: build ARCHC_PDL_DIR=$(ARCHC_PDL_DIR)/ $(STX) \ --quick \ - --package-path $(MACHINEARITHMETIC_DIR) \ + --package-path $(MACHINEARITHMETIC_DIR)/src \ --package-path ../src \ --load BaselineOf$(PROJECT) \ test: build ARCHC_PDL_DIR=$(ARCHC_PDL_DIR)/ $(STX) \ - --package-path $(MACHINEARITHMETIC_DIR) \ + --package-path $(MACHINEARITHMETIC_DIR)/src \ --package-path ../src \ --load BaselineOf$(PROJECT) \ --run Builder::ReportRunner -r Builder::TestReport --fail-on-failure \