diff options
| author | Kalle Vahlman <kalle.vahlman@movial.com> | 2011-08-30 09:02:12 +0300 |
|---|---|---|
| committer | Kalle Vahlman <kalle.vahlman@movial.com> | 2011-08-30 09:20:18 +0300 |
| commit | 96941b76980e568b7b25e87760ed190662630779 (patch) | |
| tree | 7b5067e262b640f39c62b1ced2421acf9264cc29 | |
| parent | 18252ed6cff0479c0a2360917ff9bcd31f35ac51 (diff) | |
Move default build & install dirs to current working dir
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | lcmodule/Makefile | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -247,14 +247,14 @@ configfile: $(if $(wildcard $(config_file)),,config) @echo $< > /dev/null .PHONY: config -config: BUILDFOLDER := $(if $(strip $(BUILDFOLDER)),$(BUILDFOLDER),$(shell bash -c "mktemp -d")) +config: BUILDFOLDER := $(if $(strip $(BUILDFOLDER)),$(BUILDFOLDER),$(shell bash -c "pwd")/build) config: AUTO_DIR_LIB :=$(BUILDFOLDER)/autogen/ config: LIB_x32 := $(BUILDFOLDER)/liblcdriver.so config: LIB_x64 := $(BUILDFOLDER)/liblcdriver_x64.so config: LIB_x32_OBJ_DIR := x32 config: LIB_x64_OBJ_DIR := x64 config: CXX := $(CROSS_PREFIX)g++ -config: LCD_INSTALLDIR := /tmp/ +config: LCD_INSTALLDIR := $(shell pwd)/dist config: @echo Generating config file... @rm -f $(config_file) diff --git a/lcmodule/Makefile b/lcmodule/Makefile index 779e8ca..f58a0dd 100644 --- a/lcmodule/Makefile +++ b/lcmodule/Makefile @@ -270,14 +270,14 @@ configfile: $(if $(wildcard $(config_file)),,config) @echo $< > /dev/null .PHONY: config -config: BUILDFOLDER := $(if $(strip $(BUILDFOLDER)),$(BUILDFOLDER),$(shell bash -c "mktemp -d")) +config: BUILDFOLDER := $(if $(strip $(BUILDFOLDER)),$(BUILDFOLDER),$(shell bash -c "pwd")) config: LCM_AUTO_DIR:=$(BUILDFOLDER)/autogen config: AUTO_DIR_LIB:=$(LCM_AUTO_DIR)/lib config: AUTO_DIR_LOADER:=$(LCM_AUTO_DIR)/loader config: LIB_x32 := $(BUILDFOLDER)/liblcm.so.1 config: LIB_x64 := $(BUILDFOLDER)/liblcm_x64.so.1 -config: LCMLIB_INSTALLDIR := /tmp/ -config: LCMLDR_INSTALLDIR := /tmp/ +config: LCMLIB_INSTALLDIR := $(shell pwd)/dist +config: LCMLDR_INSTALLDIR := $(shell pwd)/dist config: LIB_x32_OBJ_DIR := x32 config: LIB_x64_OBJ_DIR := x64 config: CC := gcc |