From 5fc3828c613642d88ad812d93d52719f68f69278 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Wed, 8 Nov 2017 17:56:49 +0100 Subject: [PATCH] Fix the output directory printout for install targets --- rules.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/rules.mk b/rules.mk index dc7e71d..81995e0 100644 --- a/rules.mk +++ b/rules.mk @@ -202,12 +202,14 @@ product.test: product .ALWAYS $(PRINT_TEST) $(TEST_ENV) $(TEST_CMD_$*) $(OBJROOT)/$*$(EXE_EXT) $(TEST_ARGS_$*) # Installing the product: always need to build it first -%.install_exe: build - $(PRINT_INSTALL) mkdir -p $(PREFIX_BIN) && $(INSTALL) $* $(PREFIX_BIN) -%.install_lib: build $(PREFIX_LIB).mkdir - $(PRINT_INSTALL) mkdir -p $(PREFIX_LIB) && $(INSTALL) $* $(PREFIX_LIB) -%.install_dll: build - $(PRINT_INSTALL) mkdir -p $(PREFIX_DLL) && $(INSTALL) $* $(PREFIX_DLL) +%.install_exe: $(PREFIX_BIN).mkdir build + $(PRINT_INSTALL) $(INSTALL) $* $(PREFIX_BIN) +%.install_lib: $(PREFIX_LIB).mkdir build + $(PRINT_INSTALL) $(INSTALL) $* $(PREFIX_LIB) +%.install_dll: $(PREFIX_DLL).mkdir build + $(PRINT_INSTALL) $(INSTALL) $* $(PREFIX_DLL) +$(PREFIX)%.mkdir: + $(PRINT_COMMAND) mkdir -p $(PREFIX)$* # Benchmarking (always done with profile target) benchmark: $(BENCHMARK:%=%.benchmark) $(BENCHMARKS:%=%.benchmark)