From 6166d6d943609726fa7b1225c3faf6403665ec06 Mon Sep 17 00:00:00 2001 From: Ben Smith Date: Fri, 16 Jun 2017 17:32:18 -0700 Subject: Use custom command to copy to bin/ (#502) The last build will always be in the bin directory. This also means that `make install` will install to the "normal" place for that OS, e.g. `/usr/local/bin`. Fixes #495. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 926b86df..46317021 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ $(call CMAKE_DIR,$(1),$(2),$(3)): $(call CMAKE_DIR,$(1),$(2),$(3))$$(BUILD_FILE): | $(call CMAKE_DIR,$(1),$(2),$(3)) cd $(call CMAKE_DIR,$(1),$(2),$(3)) && \ - $$(CMAKE_CMD) -G $$(GENERATOR) -DCMAKE_INSTALL_PREFIX=$$(ROOT_DIR) $$(ROOT_DIR) $$($(1)_FLAG) $$($(2)_FLAG) $$($(3)_FLAG) + $$(CMAKE_CMD) -G $$(GENERATOR) $$(ROOT_DIR) $$($(1)_FLAG) $$($(2)_FLAG) $$($(3)_FLAG) endef define BUILD @@ -117,7 +117,7 @@ endef define INSTALL .PHONY: $(call INSTALL_TARGET,$(1),$(2),$(3)) -$(call INSTALL_TARGET,$(1),$(2),$(3)): $(call BUILD_TARGET,$(1),$(2),$(3)) +$(call INSTALL_TARGET,$(1),$(2),$(3)): $(call CMAKE_DIR,$(1),$(2),$(3))$$(BUILD_FILE) $$(BUILD_CMD) -C $(call CMAKE_DIR,$(1),$(2),$(3)) install endef -- cgit v1.2.3