[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/01: [sboxes] make the build of msboxes.{ms, pdf} work with BS
From: |
Ingo Schwarze |
Subject: |
[groff] 01/01: [sboxes] make the build of msboxes.{ms, pdf} work with BSD make |
Date: |
Tue, 22 Mar 2022 08:45:18 -0400 (EDT) |
schwarze pushed a commit to branch master
in repository groff.
commit 4e0905d82276cd124ceb6bbb4a582910393aef22
Author: Ingo Schwarze <schwarze@openbsd.org>
AuthorDate: Tue Mar 22 13:41:31 2022 +0100
[sboxes] make the build of msboxes.{ms,pdf} work with BSD make
Do not erratically osciallate between using target names with and
without a leading "./" because some make(1) implementations -
for example OpenBSD make - treat "contrib/sboxes/msboxes.ms"
and "./contrib/sboxes/msboxes.ms" as different targets,
resulting in an empty script getting executed instead of the
intended one and the target file not getting built at all.
Instead, use $(sboxes_builddir) consistently on these two files
to prevent variations in target names.
OK gbranden@
---
contrib/sboxes/ChangeLog | 14 ++++++++++----
contrib/sboxes/sboxes.am | 4 ++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog
index d77d8732..98893d1c 100644
--- a/contrib/sboxes/ChangeLog
+++ b/contrib/sboxes/ChangeLog
@@ -1,17 +1,23 @@
-2021-02-06 G. Branden Robinson <g.branden.robinson@gmail.com>
+2022-03-22 Ingo Schwarze <schwarze@openbsd.org>
+
+ * sboxes.am: make the build of msboxes.{ms,pdf} work with BSD
+ make by using $(sboxes_builddir) consistently to prevent
+ variations in target names.
+
+2022-02-06 G. Branden Robinson <g.branden.robinson@gmail.com>
* sboxes.tmac: Prefix early diagnostics with package file name
literally. (We don't yet know if we can use \*[] string
interpolation.) It is better to violate DRY a little here than
to obscure from the user what is emitting the diagnostic.
-2021-02-06 G. Branden Robinson <g.branden.robinson@gmail.com>
+2022-02-06 G. Branden Robinson <g.branden.robinson@gmail.com>
* sboxes.tmac: Skip macro package instead of aborting if there
are prerequisite problems. This is an auxiliary package; it is
not necessarily fatal to the user's purposes if it doesn't load.
-2021-02-06 G. Branden Robinson <g.branden.robinson@gmail.com>
+2022-02-06 G. Branden Robinson <g.branden.robinson@gmail.com>
* sboxes.tmac: Stop requiring ms package. As the documentation
says, it's not necessary; sboxes will simply take advantage of
@@ -20,7 +26,7 @@
only if the `GS` register exists, so that warnings aren't thrown
when ms is not loaded.
-2021-02-06 G. Branden Robinson <g.branden.robinson@gmail.com>
+2022-02-06 G. Branden Robinson <g.branden.robinson@gmail.com>
* notquine.sed: Convert tilde to special character when inlining
document source (\~ is used).
diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am
index 61d814f7..c4c0af2f 100644
--- a/contrib/sboxes/sboxes.am
+++ b/contrib/sboxes/sboxes.am
@@ -36,8 +36,8 @@ SBOXES_EXAMPLEFILES = $(sboxes_srcdir)/msboxes.ms.in
if BUILD_EXAMPLES
sboxesexampledir = $(exampledir)/sboxes
dist_sboxesexample_DATA = $(SBOXES_EXAMPLEFILES)
-SBOXES_PROCESSEDEXAMPLEFILES = contrib/sboxes/msboxes.ms \
- contrib/sboxes/msboxes.pdf
+SBOXES_PROCESSEDEXAMPLEFILES = $(sboxes_builddir)/msboxes.ms \
+ $(sboxes_builddir)/msboxes.pdf
sboxesprocessedexampledir = $(exampledir)/sboxes
nodist_sboxesprocessedexample_DATA = $(SBOXES_PROCESSEDEXAMPLEFILES)
else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/01: [sboxes] make the build of msboxes.{ms, pdf} work with BSD make,
Ingo Schwarze <=