[groff] 02/04: [font]: Fix in-tree build.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 6fa88923ddce5abc27b1ab634cd0802e795b1a10
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Mar 25 18:23:35 2022 +1100

    [font]: Fix in-tree build.
    
    * font/devX100-12/devX100-12.am:
    * font/devX100/devX100.am:
    * font/devX75-12/devX75-12.am:
    * font/devX75/devX75.am: Fix in-tree build; expand `fontdir` rather
      instead of `abs_top_builddir` Make macro when definining Automake
      variable for generated artifacts.  Problem introduced by me in commit
      3c82cbbfe, 27 February.  Thanks to Robert Goulding for the report.
---
 ChangeLog                     | 11 +++++++++++
 font/devX100-12/devX100-12.am |  2 +-
 font/devX100/devX100.am       |  2 +-
 font/devX75-12/devX75-12.am   |  2 +-
 font/devX75/devX75.am         |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90a48ede..d6008d03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-03-25  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * font/devX100-12/devX100-12.am:
+       * font/devX100/devX100.am:
+       * font/devX75-12/devX75-12.am:
+       * font/devX75/devX75.am: Fix in-tree build; expand `fontdir`
+       rather instead of `abs_top_builddir` Make macro when definining
+       Automake variable for generated artifacts.  Problem introduced
+       by me in commit 3c82cbbfe, 27 February.  Thanks to Robert
+       Goulding for the report.
+
 2022-03-22  Ingo Schwarze <schwarze@openbsd.org>
 
        * doc/doc.am: delete redundant "SUFFIXES +=" line
diff --git a/font/devX100-12/devX100-12.am b/font/devX100-12/devX100-12.am
index 042245b9..9e6674e1 100644
--- a/font/devX100-12/devX100-12.am
+++ b/font/devX100-12/devX100-12.am
@@ -36,7 +36,7 @@ DEVX10012FONTS = \
   font/devX100-12/S
 
 if !WITHOUT_X11
-devX100_12_fontdir = $(top_builddir)/font/devX100-12
+devX100_12_fontdir = $(fontdir)/font/devX100-12
 devX100_12_font_DATA = $(DEVX10012FONTS)
 endif
 
diff --git a/font/devX100/devX100.am b/font/devX100/devX100.am
index c83664a2..b9c11418 100644
--- a/font/devX100/devX100.am
+++ b/font/devX100/devX100.am
@@ -36,7 +36,7 @@ DEVX100FONTS = \
   font/devX100/S
 
 if !WITHOUT_X11
-devX100_fontdir = $(top_builddir)/font/devX100
+devX100_fontdir = $(fontdir)/font/devX100
 devX100_font_DATA = $(DEVX100FONTS)
 endif
 
diff --git a/font/devX75-12/devX75-12.am b/font/devX75-12/devX75-12.am
index 057c862f..aa94ea5b 100644
--- a/font/devX75-12/devX75-12.am
+++ b/font/devX75-12/devX75-12.am
@@ -36,7 +36,7 @@ DEVX7512FONTS = \
   font/devX75-12/S
 
 if !WITHOUT_X11
-devX75_12_fontdir = $(top_builddir)/font/devX75-12
+devX75_12_fontdir = $(fontdir)/font/devX75-12
 devX75_12_font_DATA = $(DEVX7512FONTS)
 endif
 
diff --git a/font/devX75/devX75.am b/font/devX75/devX75.am
index 68a759e7..bef3e9dc 100644
--- a/font/devX75/devX75.am
+++ b/font/devX75/devX75.am
@@ -36,7 +36,7 @@ DEVX75FONTS = \
   font/devX75/S
 
 if !WITHOUT_X11
-devX75_fontdir = $(top_builddir)/font/devX75
+devX75_fontdir = $(fontdir)/font/devX75
 devX75_font_DATA = $(DEVX75FONTS)
 endif