diff --git a/gcc/configure b/gcc/configure
index 1a32f894394..752d3bf0a99 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -8849,7 +8849,7 @@ $as_echo "$as_me: WARNING:
   *** Info and man pages documentation will not be built." >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir
diff --git a/gcc/configure.ac b/gcc/configure.ac
index f87fab97edd..f4c2ab1789e 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1283,7 +1283,7 @@ else
   *** sphinx-build is missing or too old.
   *** Info and man pages documentation will not be built.])
   AC_MSG_RESULT(no)
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir
diff --git a/libgomp/configure b/libgomp/configure
index c018cb92f80..ac3acdaceb6 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -16916,7 +16916,7 @@ $as_echo "$as_me: WARNING:
   *** Info and man pages documentation will not be built." >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir
diff --git a/libgomp/configure.ac b/libgomp/configure.ac
index 1aeac2d3cca..6e8300aba2b 100644
--- a/libgomp/configure.ac
+++ b/libgomp/configure.ac
@@ -499,7 +499,7 @@ else
   *** sphinx-build is missing or too old.
   *** Info and man pages documentation will not be built.])
   AC_MSG_RESULT(no)
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir
diff --git a/libiberty/configure b/libiberty/configure
index 7ee5d6002f7..c04fa3732fb 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -2535,7 +2535,7 @@ $as_echo "$as_me: WARNING:
   *** Info and man pages documentation will not be built." >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index b2cfef90489..d9f7b16b752 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -50,7 +50,7 @@ else
   *** sphinx-build is missing or too old.
   *** Info and man pages documentation will not be built.])
   AC_MSG_RESULT(no)
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir
diff --git a/libitm/configure b/libitm/configure
index 20f20039f3b..2a7d21e9d73 100755
--- a/libitm/configure
+++ b/libitm/configure
@@ -18094,7 +18094,7 @@ $as_echo "$as_me: WARNING:
   *** Info and man pages documentation will not be built." >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir
diff --git a/libitm/configure.ac b/libitm/configure.ac
index 6930f5abaae..be5d7158745 100644
--- a/libitm/configure.ac
+++ b/libitm/configure.ac
@@ -331,7 +331,7 @@ else
   *** sphinx-build is missing or too old.
   *** Info and man pages documentation will not be built.])
   AC_MSG_RESULT(no)
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir
diff --git a/libquadmath/configure b/libquadmath/configure
index b7928de4ef4..26fd6a49012 100755
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -13311,7 +13311,7 @@ $as_echo "$as_me: WARNING:
   *** Info and man pages documentation will not be built." >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir
diff --git a/libquadmath/configure.ac b/libquadmath/configure.ac
index f2befdcb16e..e593b3147fd 100644
--- a/libquadmath/configure.ac
+++ b/libquadmath/configure.ac
@@ -424,7 +424,7 @@ else
   *** sphinx-build is missing or too old.
   *** Info and man pages documentation will not be built.])
   AC_MSG_RESULT(no)
-  SPHINX_BUILD=
+  SPHINX_BUILD=sphinx-build
   HAS_SPHINX_BUILD=
 fi
 rm -rf $tempdir