[groff] 22/27: [devX*]: Fix incorrect installation directories.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 9b94ded3dc2801e240a1b650486fd56713a84e54
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue May 3 10:52:10 2022 -0500

    [devX*]: Fix incorrect installation directories.
    
    * font/devX100-12/devX100-12.am (devX100_12_fontdir):
    * font/devX100/devX100.am (devX100_fontdir):
    * font/devX75-12/devX75-12.am (devX75_12_fontdir):
    * font/devX75/devX75.am (devX75_fontdir): Define macros without an extra
      "font/" layer in the directory hierarchy.
    
    Fixes problem introduced by me in commit 3c82cbbfe5, 27 February.
---
 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 0d4d295e..a86387b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-05-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * font/devX100-12/devX100-12.am (devX100_12_fontdir):
+       * font/devX100/devX100.am (devX100_fontdir):
+       * font/devX75-12/devX75-12.am (devX75_12_fontdir):
+       * font/devX75/devX75.am (devX75_fontdir): Define macros without
+       an extra "font/" layer in the directory hierarchy.
+
+       Fixes problem introduced by me in commit 3c82cbbfe5, 27
+       February.
+
 2022-05-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * font/devpdf/devpdf.am (font/devpdf/util/BuildFoundries): Spell
diff --git a/font/devX100-12/devX100-12.am b/font/devX100-12/devX100-12.am
index 9e6674e1..a1a509cc 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 = $(fontdir)/font/devX100-12
+devX100_12_fontdir = $(fontdir)/devX100-12
 devX100_12_font_DATA = $(DEVX10012FONTS)
 endif
 
diff --git a/font/devX100/devX100.am b/font/devX100/devX100.am
index b9c11418..77b35d32 100644
--- a/font/devX100/devX100.am
+++ b/font/devX100/devX100.am
@@ -36,7 +36,7 @@ DEVX100FONTS = \
   font/devX100/S
 
 if !WITHOUT_X11
-devX100_fontdir = $(fontdir)/font/devX100
+devX100_fontdir = $(fontdir)/devX100
 devX100_font_DATA = $(DEVX100FONTS)
 endif
 
diff --git a/font/devX75-12/devX75-12.am b/font/devX75-12/devX75-12.am
index aa94ea5b..ddca5b55 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 = $(fontdir)/font/devX75-12
+devX75_12_fontdir = $(fontdir)/devX75-12
 devX75_12_font_DATA = $(DEVX7512FONTS)
 endif
 
diff --git a/font/devX75/devX75.am b/font/devX75/devX75.am
index bef3e9dc..b2f7b0bd 100644
--- a/font/devX75/devX75.am
+++ b/font/devX75/devX75.am
@@ -36,7 +36,7 @@ DEVX75FONTS = \
   font/devX75/S
 
 if !WITHOUT_X11
-devX75_fontdir = $(fontdir)/font/devX75
+devX75_fontdir = $(fontdir)/devX75
 devX75_font_DATA = $(DEVX75FONTS)
 endif