loleaflet/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 54e85d9cc2f7ecbd953a68fdadbf6c66f23b1b59 Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Nov 25 13:11:46 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Nov 25 13:49:29 2019 +0100 Fix build without --enable-debug Since c59bf4ed3a95e742f1610277ec8b0906070ed2bf, $(ENABLE_DEBUG) is eiher "false" or "true", not empty or "true". So we can't check it in Makefiles with just $(if $(ENABLE_DEBUG),...), that will match also the value "false". Change-Id: I17c079f1c3a6346e9f0a0219f07f642673b55a98 Reviewed-on: https://gerrit.libreoffice.org/83663 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 5eac57527..c412f71a3 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -100,7 +100,7 @@ LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file)))) $(eval $(call file_targets,$(LOLEAFLET_CSS))) NODE_MODULES_JS =\ - $(if $(ENABLE_DEBUG),node_modules/hammerjs/hammer.js,node_modules/hammerjs/hammer.min.js) \ + $(if $(filter true,$(ENABLE_DEBUG)),node_modules/hammerjs/hammer.js,node_modules/hammerjs/hammer.min.js) \ node_modules/jquery/dist/jquery.js \ node_modules/jquery-mousewheel/jquery.mousewheel.js \ node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \ @@ -136,7 +136,7 @@ COMMA := , EMPTY := SPACE := $(EMPTY) $(EMPTY) LOLEAFLET_VERSION = $(shell cd $(srcdir) && git log -1 --pretty=format:"%h") -LOLEAFLET_PREFIX := $(if $(ENABLE_DEBUG),$(abs_builddir),$(abs_builddir)/build) +LOLEAFLET_PREFIX := $(if $(filter true,$(ENABLE_DEBUG)),$(abs_builddir),$(abs_builddir)/build) EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///') @@ -177,7 +177,7 @@ endif $(builddir)/dist/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \ $(LOLEAFLET_PREFIX)/dist/admin-src.js - @NODE_PATH=$(abs_builddir)/node_modules:$(LOLEAFLET_PREFIX)/dist $(NODE) node_modules/browserify/bin/cmd.js -g browserify-css $(if $(ENABLE_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js + @NODE_PATH=$(abs_builddir)/node_modules:$(LOLEAFLET_PREFIX)/dist $(NODE) node_modules/browserify/bin/cmd.js -g browserify-css $(if $(filter true,$(ENABLE_DEBUG)),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js $(LOLEAFLET_PREFIX)/dist/admin-src.js: $(LOLEAFLET_ADMIN_ALL) @echo "Checking for admin JS errors..." _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
