diff --git a/XpConfig/C/print/models/CANONC3200-PS/Makefile.am b/XpConfig/C/print/models/CANONC3200-PS/Makefile.am index 586ce9f1b..8c33acccc 100644 --- a/XpConfig/C/print/models/CANONC3200-PS/Makefile.am +++ b/XpConfig/C/print/models/CANONC3200-PS/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = fonts + xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS xpc_DATA = model-config diff --git a/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am b/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am new file mode 100644 index 000000000..183cc92bb --- /dev/null +++ b/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am @@ -0,0 +1,51 @@ +xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts + +parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts + +XPFONTS = \ + AvantGarde-Book.pmf \ + AvantGarde-BookOblique.pmf \ + AvantGarde-Demi.pmf \ + AvantGarde-DemiOblique.pmf \ + Courier-Bold.pmf \ + Courier-BoldOblique.pmf \ + Courier-Oblique.pmf \ + Courier.pmf \ + Helvetica-Bold.pmf \ + Helvetica-BoldOblique.pmf \ + Helvetica-Oblique.pmf \ + Helvetica.pmf \ + LubalinGraph-Book.pmf \ + LubalinGraph-BookOblique.pmf \ + LubalinGraph-Demi.pmf \ + LubalinGraph-DemiOblique.pmf \ + NewCenturySchlbk-Bold.pmf \ + NewCenturySchlbk-BoldItalic.pmf \ + NewCenturySchlbk-Italic.pmf \ + NewCenturySchlbk-Roman.pmf \ + Souvenir-Demi.pmf \ + Souvenir-DemiItalic.pmf \ + Souvenir-Light.pmf \ + Souvenir-LightItalic.pmf \ + Symbol.pmf \ + Times-Bold.pmf \ + Times-BoldItalic.pmf \ + Times-Italic.pmf \ + Times-Roman.pmf \ + ZapfDingbats.pmf + +install-data-hook: + mkdir -p $(xpcdir) ; \ + \ + for x in $(XPFONTS) ; do \ + rm -f $(xpcdir)/$$x ; \ + ln -s $(parentdir)/$$x $(xpcdir)/$$x ; \ + done + + @rm -f $(xpcdir)/fonts.scale + $(MKFONTSCALE) $(xpcdir) + @rm -f $(xpcdir)/font.dir + $(MKFONTDIR) $(xpcdir) + +distuninstallcheck: + @: diff --git a/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am b/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am index 0f7d80e5d..a25d364fe 100644 --- a/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am +++ b/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = fonts + xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS xpc_DATA = model-config diff --git a/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am b/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am new file mode 100644 index 000000000..183cc92bb --- /dev/null +++ b/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am @@ -0,0 +1,51 @@ +xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts + +parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts + +XPFONTS = \ + AvantGarde-Book.pmf \ + AvantGarde-BookOblique.pmf \ + AvantGarde-Demi.pmf \ + AvantGarde-DemiOblique.pmf \ + Courier-Bold.pmf \ + Courier-BoldOblique.pmf \ + Courier-Oblique.pmf \ + Courier.pmf \ + Helvetica-Bold.pmf \ + Helvetica-BoldOblique.pmf \ + Helvetica-Oblique.pmf \ + Helvetica.pmf \ + LubalinGraph-Book.pmf \ + LubalinGraph-BookOblique.pmf \ + LubalinGraph-Demi.pmf \ + LubalinGraph-DemiOblique.pmf \ + NewCenturySchlbk-Bold.pmf \ + NewCenturySchlbk-BoldItalic.pmf \ + NewCenturySchlbk-Italic.pmf \ + NewCenturySchlbk-Roman.pmf \ + Souvenir-Demi.pmf \ + Souvenir-DemiItalic.pmf \ + Souvenir-Light.pmf \ + Souvenir-LightItalic.pmf \ + Symbol.pmf \ + Times-Bold.pmf \ + Times-BoldItalic.pmf \ + Times-Italic.pmf \ + Times-Roman.pmf \ + ZapfDingbats.pmf + +install-data-hook: + mkdir -p $(xpcdir) ; \ + \ + for x in $(XPFONTS) ; do \ + rm -f $(xpcdir)/$$x ; \ + ln -s $(parentdir)/$$x $(xpcdir)/$$x ; \ + done + + @rm -f $(xpcdir)/fonts.scale + $(MKFONTSCALE) $(xpcdir) + @rm -f $(xpcdir)/font.dir + $(MKFONTDIR) $(xpcdir) + +distuninstallcheck: + @: diff --git a/XpConfig/C/print/models/PSdefault/Makefile.am b/XpConfig/C/print/models/PSdefault/Makefile.am index be7064ea1..dea412a4a 100644 --- a/XpConfig/C/print/models/PSdefault/Makefile.am +++ b/XpConfig/C/print/models/PSdefault/Makefile.am @@ -4,3 +4,11 @@ xpcdir = @xpconfigdir@/C/print/models/PSdefault xpc_DATA = model-config +install-data-hook: + @rm -f $(xpcdir)/fonts.scale + $(MKFONTSCALE) $(xpcdir) + @rm -f $(xpcdir)/font.dir + $(MKFONTDIR) $(xpcdir) + +distuninstallcheck: + @: diff --git a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am b/XpConfig/C/print/models/PSdefault/fonts/Makefile.am index f4d15a095..8458e8193 100644 --- a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am +++ b/XpConfig/C/print/models/PSdefault/fonts/Makefile.am @@ -31,3 +31,12 @@ xpc_DATA = \ Times-Italic.pmf \ Times-Roman.pmf \ ZapfDingbats.pmf + +install-data-hook: + @rm -f $(xpcdir)/fonts.scale + $(MKFONTSCALE) $(xpcdir) + @rm -f $(xpcdir)/font.dir + $(MKFONTDIR) $(xpcdir) + +distuninstallcheck: + @: diff --git a/XpConfig/C/print/models/SPSPARC2/Makefile.am b/XpConfig/C/print/models/SPSPARC2/Makefile.am index a73424ef6..37e820268 100644 --- a/XpConfig/C/print/models/SPSPARC2/Makefile.am +++ b/XpConfig/C/print/models/SPSPARC2/Makefile.am @@ -1 +1,5 @@ -# FIXME, find out what the monolith does with this empty directory +SUBDIRS = fonts + +xpcdir = @xpconfigdir@/C/print/models/SPSPARC2 + +xpc_DATA = model-config diff --git a/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am b/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am new file mode 100644 index 000000000..a133c1d47 --- /dev/null +++ b/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am @@ -0,0 +1,34 @@ +xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts + +parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts + +XPFONTS = \ + Courier-Bold.pmf \ + Courier-BoldOblique.pmf \ + Courier-Oblique.pmf \ + Courier.pmf \ + Helvetica-Bold.pmf \ + Helvetica-BoldOblique.pmf \ + Helvetica-Oblique.pmf \ + Helvetica.pmf \ + Symbol.pmf \ + Times-Bold.pmf \ + Times-BoldItalic.pmf \ + Times-Italic.pmf \ + Times-Roman.pmf + +install-data-hook: + mkdir -p $(xpcdir) ; \ + \ + for x in $(XPFONTS) ; do \ + rm -f $(xpcdir)/$$x ; \ + ln -s $(parentdir)/$$x $(xpcdir)/$$x ; \ + done + + @rm -f $(xpcdir)/fonts.scale + $(MKFONTSCALE) $(xpcdir) + @rm -f $(xpcdir)/font.dir + $(MKFONTDIR) $(xpcdir) + +distuninstallcheck: + @: diff --git a/configure.ac b/configure.ac index a6475b1f9..8a750f6a6 100644 --- a/configure.ac +++ b/configure.ac @@ -921,6 +921,9 @@ if test "x$XPRINT" = xyes; then xpconfigdir=$libdir/X11/xserver AC_SUBST([xpconfigdir]) + + AC_PATH_PROG(MKFONTSCALE, mkfontscale) + AC_PATH_PROG(MKFONTDIR, mkfontdir) fi @@ -1167,11 +1170,14 @@ XpConfig/C/print/models/PSdefault/fonts/Makefile XpConfig/C/print/models/PSdefault/Makefile XpConfig/C/print/models/PSspooldir/Makefile XpConfig/C/print/models/SPSPARC2/Makefile +XpConfig/C/print/models/SPSPARC2/fonts/Makefile XpConfig/C/print/models/GSdefault/Makefile XpConfig/C/print/models/HPLJ4050-PS/Makefile +XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile XpConfig/C/print/models/Makefile XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile XpConfig/C/print/models/CANONC3200-PS/Makefile +XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile XpConfig/C/print/models/HPLJ4family/fonts/Makefile XpConfig/C/print/models/HPLJ4family/Makefile XpConfig/C/print/models/HPDJ1600C/Makefile