[Libreoffice-commits] online.git: .gitignore loleaflet/Makefile.am

[Henry Castro (via logerrit)]

 .gitignore            |    2 +-
 loleaflet/Makefile.am |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit bd298d037bdba2a564f427746a0e691ed1a11239
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed May 27 11:16:08 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Fri May 29 04:22:33 2020 +0200

    loleaflet: makefile: set default INTERMEDIATE_DIR var
    
    and configurable.
    
    Change-Id: I4f1b111e1f9ce4e8c9e0b13755dce04f99672e1e
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94981
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/.gitignore b/.gitignore
index 0fc2cab91..4537a7669 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,7 @@ loolwsd.log
 *.mo
 
 # loleaflet
-loleaflet/build/dist
+loleaflet/build
 loleaflet/dist
 loleaflet/npm-shrinkwrap.json
 loleaflet/jsconfig.json
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 44765b243..4f6c29a19 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -322,7 +322,7 @@ COMMA := ,
 EMPTY :=
 SPACE := $(EMPTY) $(EMPTY)
 LOLEAFLET_VERSION = $(shell cd $(srcdir) && git log -1 --pretty=format:"%h")
-INTERMEDIATE_DIR := $(if $(filter true,$(ENABLE_DEBUG)),$(abs_builddir),$(abs_builddir)/build)
+INTERMEDIATE_DIR ?= $(abs_builddir)/build
 
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
 
@@ -417,6 +417,7 @@ $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
 	@NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE) node_modules/browserify/bin/cmd.js -g browserify-css $(if $(filter true,$(ENABLE_DEBUG)),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
 
 $(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
+	@mkdir -p $(dir $@)
 	@echo "Checking for admin JS errors..."
 	@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
 	@awk 'FNR == 1 {print ""} 1' $(patsubst %.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
@@ -638,7 +639,7 @@ l10n: pot
 
 clean-local:
 	@rm -rf $(DIST_FOLDER)
-	@rm -rf $(builddir)/build/dist
+	@rm -rf $(INTERMEDIATE_DIR)
 	@rm -f $(abs_srcdir)/jsconfig.json
 	@rm -f $(abs_srcdir)/admin/jsconfig.json