From c014828d6f0463e64da345f5d6ee0556d6934200 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Tue, 3 Dec 2019 19:54:08 +0300 Subject: [PATCH] Change build dir to 'build_tools' --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7dfb15b3..ff621889 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,3 @@ -OUTPUT_DIR = build/server -OUTPUT = $(OUTPUT_DIR) - GRUNT = grunt GRUNT_FLAGS = --no-color -v @@ -49,6 +46,8 @@ endif TARGET := $(PLATFORM)_$(ARCHITECTURE) +OUTPUT = ../build_tools/out/$(TARGET)/onlyoffice/documentserver/server + FILE_CONVERTER = $(OUTPUT)/FileConverter/bin FILE_CONVERTER_FILES += ../core/build/lib/$(TARGET)/$(LIB_PREFIX)DjVuFile$(SHARED_EXT) FILE_CONVERTER_FILES += ../core/build/lib/$(TARGET)/$(LIB_PREFIX)doctrenderer$(SHARED_EXT)