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

[Henry Castro (via logerrit)]

 loleaflet/Makefile.am |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 81ec172a1030df461dd9d210e32179217abe368b
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue May 26 08:36:34 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu May 28 22:06:51 2020 +0200

    loleaflet: makefile: simplify NODE_PATH var
    
    Change-Id: I96a221f92aa2d3785cc6c83add84fc37680a6183
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94860
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 00e77e662..1a1f6ce13 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -9,6 +9,8 @@ else
 DIST_FOLDER = $(builddir)/dist
 endif
 
+export NODE_PATH=$(abs_builddir)/node_module
+
 if !ENABLE_MOBILEAPP
 L10N_JSON = $(patsubst $(srcdir)/po/%.po,$(DIST_FOLDER)/l10n/%.json,$(L10N_PO))
 else
@@ -359,7 +361,7 @@ $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
 
 $(LOLEAFLET_PREFIX)/dist/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
 	@echo "Checking for admin JS errors..."
-	@NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
+	@$(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)) > $@
 
 
@@ -368,7 +370,7 @@ if ENABLE_DEBUG
 $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST)
 	@mkdir -p $(dir $@)
 	@echo "Checking for loleaflet JS errors..."
-	@NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
+	@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
 		$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
 	@touch $@
 
@@ -383,7 +385,7 @@ else
 $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
 	@mkdir -p $(dir $@)
 	@echo "Checking for loleaflet JS errors..."
-	@NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
+	@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
 		$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
 	@m4 -PE -DIOSAPP=$(ENABLE_IOSAPP) \
 		-DGTKAPP=$(ENABLE_GTKAPP) \
@@ -396,11 +398,11 @@ $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
 
 $(DIST_FOLDER)/bundle.css: $(LOLEAFLET_CSS)
 	@echo "Uglify loleaflet css files..."
-	@NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
+	@$(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@
 
 $(DIST_FOLDER)/global.js: $(srcdir)/js/global.js
 	@echo "Uglify global.js file..."
-	@NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@
+	@$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@
 
 $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
 	$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
@@ -411,7 +413,7 @@ $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
 		-DLOLEAFLET_LIBS_JS=$(subst $(SPACE),$(COMMA),$(LOLEAFLET_LIBS_JS_SRC)) \
 		-DLOLEAFLET_JS=$(builddir)/build/dist/loleaflet-src.js \
 		$(srcdir)/bundle.js.m4 > $(LOLEAFLET_PREFIX)/dist/bundle.js
-	NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/uglify-js/bin/uglifyjs \
+	$(NODE) node_modules/uglify-js/bin/uglifyjs \
 		$(LOLEAFLET_PREFIX)/dist/bundle.js \
 		--output $@
 endif
@@ -448,7 +450,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status node_modules
 $(DIST_FOLDER)/device-%.css: $(srcdir)/css/device-%.css
 	@mkdir -p $(dir $@)
 	@if test -z '$(ENABLE_BROWSERSYNC)'; then \
-		NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/uglifycss/uglifycss $< > $@ ; \
+		$(NODE) node_modules/uglifycss/uglifycss $< > $@ ; \
 	else \
 		ln -sf $(abs_srcdir)/$< $@ ; \
 	fi