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

Henry Castro hcastro at collabora.com
Sat May 26 14:41:29 UTC 2018


 loleaflet/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1ad2e5bd652397b34d797c8ed1c3370885b3a04b
Author: Henry Castro <hcastro at collabora.com>
Date:   Sat May 26 10:39:20 2018 -0400

    loleaflet: ensure set NODE_PATH environment variable
    
    Change-Id: If0a632c258f740112352e9ad6a4f250bf2e2c9d8

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index bb18427cd..a00568555 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -159,7 +159,7 @@ $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
 
 $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS)
 	@echo "Uglify loleaflet css files..."
-	@$(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
+	@NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
 	$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
@@ -168,7 +168,7 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
 	$(srcdir)/js/toolbar.js \
 	$(srcdir)/js/main.js
 	@echo "Uglify loleaflet js files..."
-	@$(NODE) node_modules/uglify-js/bin/uglifyjs \
+	@NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/uglify-js/bin/uglifyjs \
 		$(srcdir)/js/global.js \
 		$(NODE_MODULES_JS) \
 		$(srcdir)/js/w2ui-1.5.rc1.js \


More information about the Libreoffice-commits mailing list