diff options
| author | Ben Smith <binjimin@gmail.com> | 2017-06-16 17:32:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 17:32:18 -0700 |
| commit | 6166d6d943609726fa7b1225c3faf6403665ec06 (patch) | |
| tree | af3bde2a71e29c5473710b62da6ca60ded561308 /Makefile | |
| parent | 01e176c13887be2052909e8dc88e53587856aefb (diff) | |
| download | wabt-6166d6d943609726fa7b1225c3faf6403665ec06.tar.gz wabt-6166d6d943609726fa7b1225c3faf6403665ec06.tar.bz2 wabt-6166d6d943609726fa7b1225c3faf6403665ec06.zip | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |