.gitignore | 4 ++-- loleaflet/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 38715ea2df484872b3af56e30c5ab8f021c1c4c9 Author: Henry Castro <[email protected]> AuthorDate: Tue Jun 2 10:26:34 2020 -0400 Commit: Henry Castro <[email protected]> CommitDate: Thu Jun 11 22:05:02 2020 +0200 android: create intermediate dir for build variants It is better to separate the intermediate asset files Change-Id: I50ff1b6e045679afa48c7024652de40db8fa2a71 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95366 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Henry Castro <[email protected]> diff --git a/.gitignore b/.gitignore index 4537a7669..c2281c7ba 100644 --- a/.gitignore +++ b/.gitignore @@ -56,8 +56,8 @@ loolwsd.log *.mo # loleaflet -loleaflet/build -loleaflet/dist +loleaflet/debug +loleaflet/release loleaflet/npm-shrinkwrap.json loleaflet/jsconfig.json loleaflet/admin/jsconfig.json diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 94269517b..9d9c991e6 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 ?= $(abs_builddir)/build +INTERMEDIATE_DIR ?= $(if $(IS_DEBUG),$(abs_builddir)/debug,$(abs_builddir)/release) EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///') _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
