[build]: Rename PS->groff glyph name maps (1/4).

[build]: Name and place PS->groff glyph name maps consistently.

* font/devps/symbolmap: Rename from this...
* font/devps/generate/symbol.map: ...to this.

* font/devpdf/devpdf.am (font/devpdf/map/symbolmap): Rename target...
  (font/devpdf/map/symbol.map): ...to this.
  (font/devpdf/map/symbol.map): Copy "devps" version of file from its
  new location in the "generate" subdirectory.

* font/devpdf/Foundry.in: Reflect rename.

* font/devps/generate/Makefile (symbolmap): Rename target...
  ($(srcdir)/symbol.map): ...to this.

* font/devps/devps.am (DEVPSGENFILES, EXTRA_DIST):
* font/devps/generate/Makefile (S, EURO $(SPECIALFONTS), clean):
* src/utils/afmtodit/afmtodit.1.man: Reflect rename and relocation.

5 files changed, 11 insertions, 11 deletions

diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
index 3971ad960..a4cc17f6b 100644
--- a/font/devpdf/Foundry.in
+++ b/font/devpdf/Foundry.in
@@ -110,7 +110,7 @@ PB|N|r|textmap|text.enc|P052-Bold.t1!P052-Bold!URWPalladioL-Bold!p052004l.pfb
 PBI|N|i|textmap|text.enc|P052-BoldItalic.t1!P052-BoldItalic!URWPalladioL-BoldItal!p052024l.pfb
 PI|N|i|textmap|text.enc|P052-Italic.t1!P052-Italic!URWPalladioL-Ital!p052023l.pfb
 PR|N|r|textmap|text.enc|P052-Roman.t1!P052-Roman!URWPalladioL-Roma!p052003l.pfb
-S|N|sr|symbolmap||StandardSymbolsPS.t1!StandardSymbolsPS!StandardSymL!s050000l.pfb
+S|N|sr|symbol.map||StandardSymbolsPS.t1!StandardSymbolsPS!StandardSymL!s050000l.pfb
 TB|N|r|textmap|text.enc|NimbusRoman-Bold.t1!NimbusRoman-Bold!NimbusRomNo9L-Medi!n021004l.pfb
 TBI|N|i|textmap|text.enc|NimbusRoman-BoldItalic.t1!NimbusRoman-BoldItalic!NimbusRomNo9L-MediItal!n021024l.pfb
 TI|N|i|textmap|text.enc|NimbusRoman-Italic.t1!NimbusRoman-Italic!NimbusRomNo9L-ReguItal!n021023l.pfb
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 24461a861..14c15b119 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -43,7 +43,7 @@ DEVPDFFONTMAP_1 = \
   font/devpdf/map/dingbats.map \
   font/devpdf/map/symbolchars \
   font/devpdf/map/textmap
-DEVPDFFONTMAP_2 = font/devpdf/map/symbolmap
+DEVPDFFONTMAP_2 = font/devpdf/map/symbol.map
 devpdffontmap_DATA = $(DEVPDFFONTMAP_1) $(DEVPDFFONTMAP_2)
 
 EXTRA_DIST += \
@@ -58,9 +58,9 @@ font/devpdf/enc/text.enc:
 	$(AM_V_at)cp -f $(top_srcdir)/font/devps/text.enc \
 	  $(top_builddir)/font/devpdf/enc
 
-font/devpdf/map/symbolmap:
+font/devpdf/map/symbol.map:
 	$(AM_V_at)$(MKDIR_P) $(top_builddir)/font/devpdf/map
-	$(AM_V_at)cp -f $(top_srcdir)/font/devps/symbolmap \
+	$(AM_V_at)cp -f $(top_srcdir)/font/devps/generate/symbol.map \
 	  $(top_builddir)/font/devpdf/map
 
 $(DEVPDFFONTMAP_1):
diff --git a/font/devps/devps.am b/font/devps/devps.am
index 6e59572a1..fb1cb2b8f 100644
--- a/font/devps/devps.am
+++ b/font/devps/devps.am
@@ -113,6 +113,7 @@ DEVPSGENFILES = \
   font/devps/generate/dingbats.map \
   font/devps/generate/dingbats.rmap \
   font/devps/generate/lgreekmap \
+  font/devps/generate/symbol.map \
   font/devps/generate/symbolchars \
   font/devps/generate/textmap
 DEVPSGENSCRIPTS = \
@@ -123,7 +124,6 @@ dist_devpsgen_DATA = $(DEVPSGENFILES) $(DEVPSGENSCRIPTS)
 
 MOSTLYCLEANFILES += $(DEVPSFONTFILES_GENERATED)
 EXTRA_DIST += \
-  font/devps/symbolmap \
   font/devps/DESC.in  \
   font/devps/prologue.ps \
   font/devps/psstrip.sed \
diff --git a/font/devps/generate/Makefile b/font/devps/generate/Makefile
index 1c8e276d7..110d1aa26 100644
--- a/font/devps/generate/Makefile
+++ b/font/devps/generate/Makefile
@@ -245,7 +245,7 @@ SS: $(OUTDIR)/symbolsl.afm
 
 S: symbol.afm
 	$(AFMTODIT) -s $(RFLAG) \
-	  symbol.afm symbolmap $(OUTDIR)/$@
+	  symbol.afm $(srcdir)/symbol.map $(OUTDIR)/$@
 
 ZDR: $(OUTDIR)/zapfdr.afm
 	$(AFMTODIT) -s $(RFLAG) \
@@ -254,7 +254,7 @@ ZDR: $(OUTDIR)/zapfdr.afm
 # the map is just a dummy
 EURO: freeeuro.afm
 	$(AFMTODIT) $(RFLAG) \
-	  freeeuro.afm symbolmap $(OUTDIR)/$@
+	  freeeuro.afm $(srcdir)/symbol.map $(OUTDIR)/$@
 
 freeeuro.afm freeeuro.pfa: $(srcdir)/freeeuro.sfd
 	fontforge -script $(srcdir)/sfdtopfa.pe $(srcdir)/freeeuro.sfd \
@@ -281,11 +281,11 @@ zapfdr.afm: $(srcdir)/apfdr.sed
 ZD: $(srcdir)/dingbats.map
 ZDR: $(srcdir)/dingbats.rmap
 $(TEXTFONTS): $(TEXTMAP) $(TEXTENC)
-$(SPECIALFONTS): symbolmap
+$(SPECIALFONTS): $(srcdir)/symbol.map
 $(GREEKFONTS): $(srcdir)/lgreekmap
 $(FONTS): $(DESC)
 
-symbolmap: $(TEXTMAP) $(srcdir)/symbolchars
+$(srcdir)/symbol.map: $(TEXTMAP) $(srcdir)/symbolchars
 	printf \
 	  '#\n# This is a list of all predefined groff symbols.\n#\n' \
 	  > $(OUTDIR)/$@ \
@@ -293,8 +293,8 @@ symbolmap: $(TEXTMAP) $(srcdir)/symbolchars
 
 clean:
 	cd $(OUTDIR) \
-	  && $(RM) freeeuro.afm freeeuro.pfa symbol.afm symbolmap \
-	    symbolsl.afm zapfdr.afm
+	  && $(RM) freeeuro.afm freeeuro.pfa symbol.afm \
+	    $(srcdir)/symbol.map symbolsl.afm zapfdr.afm
 
 realclean: clean
 	cd $(OUTDIR) \
diff --git a/font/devps/symbolmap b/font/devps/generate/symbol.map
index 8f1d2f159..8f1d2f159 100644
--- a/font/devps/symbolmap
+++ b/font/devps/generate/symbol.map