When building GNU PSPP I see this:
--- /home/collin/.local/src/pspp/gl/m4/gnulib-cache.m4 2024-04-02
18:10:06.209522277 -0700
+++ /home/collin/.local/src/glpyXBzSID/gl/m4/gnulib-cache.m4 2024-04-02
18:09:37.828467148 -0700
@@ -31,7 +31,7 @@
# --lib=libgl \
# --source-base=gl \
# --m4-base=gl/m4 \
-# --doc-base=gl/doc \
+# --doc-base=doc \
# --tests-base=tests \
# --aux-dir=build-aux \
# --makefile-name=automake.mk \
@@ -302,7 +302,7 @@
gl_SOURCE_BASE([gl])
gl_M4_BASE([gl/m4])
gl_PO_BASE([])
-gl_DOC_BASE([gl/doc])
+gl_DOC_BASE([doc])
gl_TESTS_BASE([tests])
gl_LIB([libgl])
gl_MAKEFILE_NAME([automake.mk])
This patch fixes it. It seems that gnulib-tool.py never respected the
directory passed with --doc-base.
PSPP doesn't use the bootstrap script, and running make without a
target will fail with GNULIB_TOOL_IMPL=sh+py because of some *.png
files.
This seems to work:
env GNUMAKEFLAGS="" GNULIB_TOOL_IMPL=sh+py make -f Smake prep_ph
Collin
From 89fbe03cde20a249899e8878c525f47b41286d45 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Tue, 2 Apr 2024 18:04:09 -0700
Subject: [PATCH] gnulib-tool.py: Don't ignore the argument to --doc-base.
* pygnulib/main.py (main): Check for the argument to --doc-base before
creating the GLConfig object.
---
ChangeLog | 6 ++++++
pygnulib/main.py | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index d6b9f731bc..068fe06662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-04-02 Collin Funk <collin.fu...@gmail.com>
+
+ gnulib-tool.py: Don't ignore the argument to --doc-base.
+ * pygnulib/main.py (main): Check for the argument to --doc-base before
+ creating the GLConfig object.
+
2024-04-02 Collin Funk <collin.fu...@gmail.com>
gnulib-tool.py: Use [] instead of list() to initialize empty lists.
diff --git a/pygnulib/main.py b/pygnulib/main.py
index c6a6bd3241..233c79182e 100644
--- a/pygnulib/main.py
+++ b/pygnulib/main.py
@@ -738,6 +738,9 @@ def main() -> None:
pobase = cmdargs.pobase
if pobase != None:
pobase = cmdargs.pobase[0]
+ docbase = cmdargs.docbase
+ if docbase != None:
+ docbase = cmdargs.docbase[0]
testsbase = cmdargs.testsbase
if testsbase != None:
testsbase = cmdargs.testsbase[0]
@@ -808,7 +811,6 @@ def main() -> None:
copymode = cmdargs.copymode
lcopymode = cmdargs.lcopymode
single_configure = cmdargs.single_configure
- docbase = None
# Create pygnulib configuration.
config = GLConfig(
--
2.44.0