summaryrefslogtreecommitdiff
path: root/math/maxima/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/maxima/files')
-rw-r--r--math/maxima/files/patch-Makefile.am6
-rw-r--r--math/maxima/files/patch-configure.ac6
2 files changed, 6 insertions, 6 deletions
diff --git a/math/maxima/files/patch-Makefile.am b/math/maxima/files/patch-Makefile.am
index 165de96d6477..0357a12fee00 100644
--- a/math/maxima/files/patch-Makefile.am
+++ b/math/maxima/files/patch-Makefile.am
@@ -1,11 +1,11 @@
---- Makefile.am.orig 2022-05-09 16:39:32 UTC
+--- Makefile.am.orig 2024-07-23 03:31:18 UTC
+++ Makefile.am
@@ -10,7 +10,7 @@ endif
DOC_DIR = doc
endif
--SUBDIRS = admin crosscompile-windows src lisp-utils tests $(DOC_DIR) interfaces share demo plotting desktopintegration $(LOCALE_DIR)
-+SUBDIRS = admin crosscompile-windows src lisp-utils tests interfaces share plotting desktopintegration $(LOCALE_DIR)
+-SUBDIRS = admin crosscompile-windows src lisp-utils $(DOC_DIR) interfaces share demo plotting desktopintegration $(LOCALE_DIR) tests
++SUBDIRS = admin crosscompile-windows src lisp-utils interfaces share demo plotting desktopintegration $(LOCALE_DIR) tests
EXTRA_DIST = \
common.mk maxima.iss.in \
diff --git a/math/maxima/files/patch-configure.ac b/math/maxima/files/patch-configure.ac
index 4d03280b444b..e41566c43930 100644
--- a/math/maxima/files/patch-configure.ac
+++ b/math/maxima/files/patch-configure.ac
@@ -1,4 +1,4 @@
---- configure.ac.orig 2024-09-01 19:17:42 UTC
+--- configure.ac.orig 2025-08-06 06:49:54 UTC
+++ configure.ac
@@ -165,21 +165,21 @@ dnl See if git exists. If it does, update VERSION to
@@ -37,11 +37,11 @@
dnl Parses the version number for the manual
manual_version=`echo $VERSION | sed 's+branch_++; s+_base++; s+_dirty++; s+_+.+g'`
-@@ -644,7 +644,7 @@ if test x"${enable_build_docs}" = xtrue ; then
+@@ -697,7 +697,7 @@ if test x"${enable_build_docs}" = xtrue ; then
dnl assuming that the end of the version string contains the
dnl version number consisting of digits separated by a period.
dnl This allows for version numbers like 6.8.90.
-- makeinfo_version_string=`expr "\`makeinfo --version | head -1\`" : '.* \([[.0-9]]\+\)'`
+- makeinfo_version_string=`expr "\`$MAKEINFO --version | head -1\`" : '.* \([[.0-9]][[.0-9]]*\)'`
+ makeinfo_version_string=`expr "$(makeinfo --version | head -1)" : '.* \([[.0-9]]\+\)'`
dnl echo Makeinfo version ${makeinfo_version}