From: Collin Funk <collin.funk1@gmail.com>
To: bug-gnulib@gnu.org
Subject: gnulib-tool.py: Don't ignore the argument to --doc-base.
Date: Tue, 2 Apr 2024 18:21:27 -0700 [thread overview]
Message-ID: <5247e357-aa3d-4e32-9d24-39cca1cafd5d@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 978 bytes --]
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
[-- Attachment #2: 0001-gnulib-tool.py-Don-t-ignore-the-argument-to-doc-base.patch --]
[-- Type: text/x-patch, Size: 1609 bytes --]
From 89fbe03cde20a249899e8878c525f47b41286d45 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@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.funk1@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.funk1@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
next reply other threads:[~2024-04-03 1:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 1:21 Collin Funk [this message]
2024-04-03 23:00 ` gnulib-tool.py: Don't ignore the argument to --doc-base Bruno Haible
2024-04-06 13:13 ` Bruno Haible
2024-04-06 13:27 ` gnulib-tool.py speed Bruno Haible
2024-04-06 13:28 ` gnulib-tool.py: Don't ignore the argument to --doc-base Collin Funk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5247e357-aa3d-4e32-9d24-39cca1cafd5d@gmail.com \
--to=collin.funk1@gmail.com \
--cc=bug-gnulib@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).