diff options
| author | Henry Castro <hcastro@collabora.com> | 2018-05-26 10:39:20 -0400 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-01 16:23:58 +0200 |
| commit | 2b3af8e887689adaf350fc4f10c9e91a28916024 (patch) | |
| tree | 4e7ba7f50d22fb05caec980c02079b7144486880 | |
| parent | 6f42545ca1211c7839757b930dfc17877f929cdf (diff) | |
loleaflet: ensure set NODE_PATH environment variable
Change-Id: If0a632c258f740112352e9ad6a4f250bf2e2c9d8
(cherry picked from commit 1ad2e5bd652397b34d797c8ed1c3370885b3a04b)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | loleaflet/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |