fontaliases: redo the way these are built, and actually install them

Use a common make include file to do most of the work and set the
appropriate LANG from localized/templates/ .  This should simplify it
quite a bit and reduce duplication.

Also we were not even installing them, so now we are.

diff --git a/cde/programs/fontaliases/bdf/Makefile.am b/cde/programs/fontaliases/bdf/Makefile.am
index a6aeb18815c6f4ee2130171c0a425d6632321ecc..30ec3a6f40a8e74ed049606ae4172a5805772e8e 100644 (file)
--- a/cde/programs/fontaliases/bdf/Makefile.am
+++ b/cde/programs/fontaliases/bdf/Makefile.am
@@ -1,8 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = $(DTINFO_FONT)
-
 DTINFO_FONT = dtinfo.pcf.gz
+noinst_DATA = $(DTINFO_FONT)
 
 BUILT_SOURCES = $(DTINFO_FONT)
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/cde/programs/fontaliases/bdf/fonts.am b/cde/programs/fontaliases/bdf/fonts.am
new file mode 100644 (file)
index 0000000..6b24150
--- /dev/null
+++ b/cde/programs/fontaliases/bdf/fonts.am
@@ -0,0 +1,15 @@
+# to be included by OS/LANG/Makefile.am's
+
+BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
+CLEANFILES = $(BUILT_SOURCES)
+
+fontdir = $(CDE_INSTALLATION_TOP)/config/xfonts/$(LANG)
+dist_font_DATA = $(BUILT_SOURCES) fonts.alias
+
+dtinfo.pcf.gz: $(top_builddir)/programs/fontaliases/bdf/dtinfo.pcf.gz
+       $(RM) $@
+       $(CP) $< $@
+
+fonts.dir: fonts.alias dtinfo.pcf.gz
+       $(MKFONTDIR) .
+

diff --git a/cde/programs/fontaliases/bdf/fonts.inc b/cde/programs/fontaliases/bdf/fonts.inc
deleted file mode 100644 (file)
index 630df8d..0000000
--- a/cde/programs/fontaliases/bdf/fonts.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-# to be included by OS/LANG/Makefile.am's
-
-
-dtinfo.pcf.gz: $(top_builddir)/programs/fontaliases/bdf/dtinfo.pcf.gz
-       $(RM) $@
-       $(CP) $< $@
-
-fonts.dir: fonts.alias dtinfo.pcf.gz
-       $(MKFONTDIR) .
-

diff --git a/cde/programs/fontaliases/freebsd/C/Makefile.am b/cde/programs/fontaliases/freebsd/C/Makefile.am
index 04d85e6c70afdf3eef0d750fc617c7596a4dd71b..4f27e144783079834d60db0fcd64813dac1ed930 100644 (file)
--- a/cde/programs/fontaliases/freebsd/C/Makefile.am
+++ b/cde/programs/fontaliases/freebsd/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

diff --git a/cde/programs/fontaliases/linux/C/Makefile.am b/cde/programs/fontaliases/linux/C/Makefile.am
index 04d85e6c70afdf3eef0d750fc617c7596a4dd71b..4f27e144783079834d60db0fcd64813dac1ed930 100644 (file)
--- a/cde/programs/fontaliases/linux/C/Makefile.am
+++ b/cde/programs/fontaliases/linux/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

diff --git a/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am b/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am
index 04d85e6c70afdf3eef0d750fc617c7596a4dd71b..74092a2f6681fc965bd7db5a238bb73386275207 100644 (file)
--- a/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am
+++ b/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/English.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

diff --git a/cde/programs/fontaliases/netbsd/C/Makefile.am b/cde/programs/fontaliases/netbsd/C/Makefile.am
index 04d85e6c70afdf3eef0d750fc617c7596a4dd71b..4f27e144783079834d60db0fcd64813dac1ed930 100644 (file)
--- a/cde/programs/fontaliases/netbsd/C/Makefile.am
+++ b/cde/programs/fontaliases/netbsd/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

diff --git a/cde/programs/fontaliases/openbsd/C/Makefile.am b/cde/programs/fontaliases/openbsd/C/Makefile.am
index 04d85e6c70afdf3eef0d750fc617c7596a4dd71b..4f27e144783079834d60db0fcd64813dac1ed930 100644 (file)
--- a/cde/programs/fontaliases/openbsd/C/Makefile.am
+++ b/cde/programs/fontaliases/openbsd/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

diff --git a/cde/programs/fontaliases/sun/C/Makefile.am b/cde/programs/fontaliases/sun/C/Makefile.am
index 04d85e6c70afdf3eef0d750fc617c7596a4dd71b..4f27e144783079834d60db0fcd64813dac1ed930 100644 (file)
--- a/cde/programs/fontaliases/sun/C/Makefile.am
+++ b/cde/programs/fontaliases/sun/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

diff --git a/cde/programs/localized/templates/English.am b/cde/programs/localized/templates/English.am
new file mode 100644 (file)
index 0000000..ce033dd
--- /dev/null
+++ b/cde/programs/localized/templates/English.am
@@ -0,0 +1,5 @@
+#  This file is a template for setting the platform-specific LANG
+#  variable for the C locale.
+
+LANG=en_US.UTF-8
+SOURCE_LANG=en_US.UTF-8