loleaflet/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 26ad0a123a9b024066808c4b7d7144b02de39886
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date: Tue Jan 30 14:54:42 2018 +0100
Ignore errors when draw directory is not deletable
Change-Id: Iec3567129f96b69174421ca1ec652dccf6a6b56c
(cherry picked from commit 4f38ff9cc8a53c498ce2de2ceaa7d635120d4034)
Reviewed-on: https://gerrit.libreoffice.org/48910
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index aa0492f0..9b34f78d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -17,7 +17,8 @@ L10N_STYLES_JSON = $(patsubst
po/styles/%.po,dist/l10n/styles/%.json,$(L10N_STYL
EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
all-local: node_modules $(L10N_JSON) $(L10N_STYLES_JSON)
- rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p
dist/plugins/draw-$(DRAW_VERSION)
+ rm -rf dist/plugins/draw-$(DRAW_VERSION) || true
+ mkdir -p dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist
../../dist/plugins/draw-$(DRAW_VERSION)
jake build debug=$(ENABLE_DEBUG) minify=$(MINIFY)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
