Fix building of js modules with "make" (fixes #3416)

meetecho · Aug 21, 2024 · bae9c51 · bae9c51
1 parent bad60d7
commit bae9c51
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -91,11 +91,11 @@ EXTRA_DIST += $(jsmodules_DATA)
 
 if ENABLE_JAVASCRIPT_MODULES
 
-npm/node_modules/rollup/dist/bin/rollup: npm/package.json
-	cd npm && $(NPM) install && touch node_modules/rollup/dist/bin/rollup
+node_modules/rollup/dist/bin/rollup: package.json
+	$(NPM) install && touch node_modules/rollup/dist/bin/rollup
 
-npm/dist/janus.%.js: html/janus.js npm/node_modules/rollup/dist/bin/rollup npm/rollup.config.mjs npm/module.js
-	cd npm && $(NPM) run rollup -- --o $(patsubst npm/%,%,$@) --f $*
+npm/dist/janus.%.js: html/demos/janus.js node_modules/rollup/dist/bin/rollup npm/rollup.config.mjs npm/module.js
+	$(NPM) run rollup -- --o $@ --f $*
 
 endif
 

diff --git a/npm/rollup.config.mjs b/npm/rollup.config.mjs
@@ -5,7 +5,8 @@ import { readFileSync } from 'fs';
 export default {
 	input: 'npm/module.js',
 	output: {
-		strict: false
+		strict: false,
+		name: 'Janus',
 	},
 	plugins: [
 		replace({