diff --git a/Makefile b/Makefile index 42b8336..fdd8db9 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,13 @@ FIJI_ROOT_PATH:=~/soft/Fiji.app FIJI_EXE_PATH=$(FIJI_ROOT_PATH)/ImageJ-linux64 # RAW_IMAGES_ROOT_PATH:='/opt/ipr/cluster/work.global/graffy/jenkins-store/lipase/raw-images' RAW_IMAGES_ROOT_PATH:=$(shell echo ~/work/lipase/raw-images) -TESTS_OUTPUT_DATA_PATH:=$(shell echo ~/work/lipase/tmp) +TEMP_PATH:=$(shell echo ~/work/lipase/tmp) +TESTS_OUTPUT_DATA_PATH:=$(TEMP_PATH) LIB_SRC_FILES=$(shell find ./src/lipase -name "*.py") PLUGINS_SRC_FILES=$(shell find ./src/ij-plugins -name "*.py") LIPASE_VERSION=1.01 -BUILD_ROOT_PATH:=$(shell pwd)/build +BUILD_ROOT_PATH:=$(TEMP_PATH)/build PACKAGE_FILE_PATH=$(BUILD_ROOT_PATH)/lipase-$(LIPASE_VERSION).zip .PHONY: all @@ -25,9 +26,9 @@ clean_doc: $(BUILD_ROOT_PATH)/ij_zip_source/jars/Lib/fr.univ-rennes1.ipr.lipase.lib.jar: $(LIB_SRC_FILES) pushd ./src; \ - mkdir -p $(BUILD_ROOT_PATH)/jars/Lib ; \ + mkdir -p $(BUILD_ROOT_PATH)/ij_zip_source/jars/Lib ; \ find ./lipase -name "*.py" > /tmp/files.txt ; \ - jar cvf $(BUILD_ROOT_PATH)/jars/Lib/fr.univ-rennes1.ipr.lipase.lib.jar @/tmp/files.txt ; \ + jar cvf $(BUILD_ROOT_PATH)/ij_zip_source/jars/Lib/fr.univ-rennes1.ipr.lipase.lib.jar @/tmp/files.txt ; \ popd .PHONY: install_ij_opencv