[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * configure.ac: Do not add js/node_modules/.bin/
From: |
Gavin D. Smith |
Subject: |
branch master updated: * configure.ac: Do not add js/node_modules/.bin/ to program search path if the directory does not exist. |
Date: |
Sat, 03 Dec 2022 07:18:47 -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 181b85a0fd * configure.ac: Do not add js/node_modules/.bin/ to program
search path if the directory does not exist.
181b85a0fd is described below
commit 181b85a0fda5cf9e6d1f8542abb806c0a1b35a7d
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Dec 3 12:18:39 2022 +0000
* configure.ac: Do not add js/node_modules/.bin/ to program
search path if the directory does not exist.
---
ChangeLog | 5 +++++
configure.ac | 12 ++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 168aefdc44..2ba9e9d194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-12-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * configure.ac: Do not add js/node_modules/.bin/ to program
+ search path if the directory does not exist.
+
2022-12-03 Gavin Smith <gavinsmith0123@gmail.com>
* tp/maintain/regenerate_file_lists.pl: Hardcode script name
diff --git a/configure.ac b/configure.ac
index 7e5df4237b..9bad0223e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,11 +391,15 @@ AC_SUBST([enable_xs])
AM_CONDITIONAL([DISABLE_XS], [test "z$enable_xs" = zno])
# Texinfo JS Interface
-# 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}"
+if test -d "$npm_path" ; then
+ # We need an absolute path to the npm programs because they are run
+ # from inside the js/ subdirectory.
+ npm_path="`cd $npm_path && pwd`"
+ npm_path="${npm_path}${PATH_SEPARATOR}${PATH}"
+else
+ npm_path="${PATH}"
+fi
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: Do not add js/node_modules/.bin/ to program search path if the directory does not exist.,
Gavin D. Smith <=