summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPaolo Bonzini2020-10-16 09:19:14 +0200
committerPaolo Bonzini2020-10-26 12:08:38 +0100
commit16bf7a3326d8e8be42b3bf844a6c539d52a997b3 (patch)
treee2e5d5904c3bd3a8481b3bd87a95bf66962802fd /Makefile
parentconfigure: allow configuring localedir (diff)
downloadqemu-16bf7a3326d8e8be42b3bf844a6c539d52a997b3.tar.gz
qemu-16bf7a3326d8e8be42b3bf844a6c539d52a997b3.tar.xz
qemu-16bf7a3326d8e8be42b3bf844a6c539d52a997b3.zip
configure: move directory options from config-host.mak to meson
Since installation is not part of Makefiles anymore, Make need not know the directories anymore. Meson already knows them through built-in options, do everything using them instead of the config_host dictionary. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5236464d1f..4d1fa8bb3d 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,10 @@ ifeq ($(wildcard build.ninja),)
.PHONY: config-host.mak
x := $(shell rm -rf meson-private meson-info meson-logs)
endif
+ifeq ($(origin prefix),file)
+.PHONY: config-host.mak
+x := $(shell rm -rf meson-private meson-info meson-logs)
+endif
# 1. ensure config-host.mak is up-to-date
config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION