[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * configure.ac: Use absolute path for checking fo
From: |
Gavin D. Smith |
Subject: |
branch master updated: * configure.ac: Use absolute path for checking for npm commands so that rules in js/Makefile.am work. |
Date: |
Tue, 15 Nov 2022 15:57:21 -0500 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new ef031738db * configure.ac: Use absolute path for checking for npm
commands so that rules in js/Makefile.am work.
ef031738db is described below
commit ef031738db269c4ae14569c2f83fae4e26197fbd
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Nov 15 20:57:13 2022 +0000
* configure.ac: Use absolute path for checking for
npm commands so that rules in js/Makefile.am work.
---
ChangeLog | 5 +++++
configure.ac | 6 +++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index a00bea219b..239189e06b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-15 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * configure.ac: Use absolute path for checking for
+ npm commands so that rules in js/Makefile.am work.
+
2022-11-15 Gavin Smith <gavinsmith0123@gmail.com>
* js/yarn.lock, js/server.js: Remove files.
diff --git a/configure.ac b/configure.ac
index 3900a85a25..bf008c3973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,7 +391,11 @@ AC_SUBST([enable_xs])
AM_CONDITIONAL([DISABLE_XS], [test "z$enable_xs" = zno])
# Texinfo JS Interface
-npm_path="${srcdir}/js/node_modules/.bin${PATH_SEPARATOR}$PATH"
+# We need an absolute path to the npm programs because they are run
+# from inside the js/ subdirectory.
+npm_path="${srcdir}/js/node_modules/.bin"
+npm_path="`cd $npm_path && pwd`"
+npm_path="${npm_path}${PATH_SEPARATOR}${PATH}"
AC_PATH_PROG([ESLINT], [eslint], [], [$npm_path])
AM_CONDITIONAL([HAVE_ESLINT], [test "x$ac_cv_path_ESLINT" != "x"])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * configure.ac: Use absolute path for checking for npm commands so that rules in js/Makefile.am work.,
Gavin D. Smith <=