Get the message catalogs installed properly on make install

diff --git a/cde/programs/localized/C/msg/Makefile.am b/cde/programs/localized/C/msg/Makefile.am
index 86ff28421ebbfb18e57158dc03733b4dd3cf7195..4d1730ce4715a09a8202ba811d40e2754b6c6e0a 100644 (file)
--- a/cde/programs/localized/C/msg/Makefile.am
+++ b/cde/programs/localized/C/msg/Makefile.am
@@ -3,3 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 include ../../templates/C.am
 include ../../templates/msg.C.am
 
+# Setup a symlink from C -> en_US.UTF-8
+install-data-hook:
+       $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/lib/nls/msg/en_US.UTF-8
+       cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/lib/nls/msg/ && $(LN_S) C en_US.UTF-8

diff --git a/cde/programs/localized/templates/msg.C.am b/cde/programs/localized/templates/msg.C.am
index 460bc9330e673eeaac97f734103270d17867eaff..d04c839e08276a678472a9a8a732a291cb6c5ad3 100644 (file)
--- a/cde/programs/localized/templates/msg.C.am
+++ b/cde/programs/localized/templates/msg.C.am
@@ -1,8 +1,10 @@
 # process the message files...
 
-# NOTYET dtinfo.cat dtinfo_start.cat 
+# NOTYET dtinfo.cat dtinfo_start.cat
 
-BUILT_SOURCES = Xm.cat Mrm.cat Uil.cat DtHelp.cat fmt_tbl.cat          \
+# BROKEN (always has been): fmt_tbl.cat
+
+BUILT_SOURCES = Xm.cat Mrm.cat Uil.cat DtHelp.cat              \
       DtMail.cat DtPrint.cat DtWidget.cat MotifApp.cat                 \
       SUNW_TOOLTALK.cat dt.cat dtact.cat dtbuilder.cat dtcalc.cat      \
       dtcm.cat dtcodegen.cat dtconfig.cat dtcopy.cat dtcreate.cat      \
@@ -15,6 +17,9 @@ BUILT_SOURCES = Xm.cat Mrm.cat Uil.cat DtHelp.cat fmt_tbl.cat         \
 
 CLEANFILES = $(BUILT_SOURCES)
 
+msgcatdir = $(CDE_INSTALLATION_TOP)/lib/nls/msg/$(LANG)
+dist_msgcat_DATA = $(BUILT_SOURCES)
+
 TOP = $(top_builddir)/programs
 TOPLIB = $(top_builddir)/lib
 TOPMOTIF = $(top_builddir)/imports/
@@ -35,9 +40,12 @@ DtHelp.cat: $(TOPLIB)/DtHelp/DtHelp.msg
        $(RM) $@
        LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
 
-fmt_tbl.cat: $(TOPLIB)/DtHelp/fmt_tbl.msg
-       $(RM) $@
-       LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+# FIXME This appears to have been broken a long time ago.  Needs
+# investigation.
+#
+#fmt_tbl.cat: $(TOPLIB)/DtHelp/fmt_tbl.msg
+#      $(RM) $@
+#      LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
 
 DtMail.cat: $(TOP)/dtmail/dtmail/DtMail.msg
        $(RM) $@

diff --git a/cde/programs/localized/templates/msg.am b/cde/programs/localized/templates/msg.am
index 2b593198f8a7324dcd822ee4c1dc1b8b3aa7ce54..14f9c47114e14859bc74e30ac04a3d89ae3bb021 100644 (file)
--- a/cde/programs/localized/templates/msg.am
+++ b/cde/programs/localized/templates/msg.am
@@ -1,11 +1,12 @@
 # message files for non-C locales - ie: local .msg files.  So much
 # nicer :)
 
-TMPLOCAL_DEST = $(shell ls *.msg |grep -v libAB |sed -e 's/.msg/.cat/g')
-
-BUILT_SOURCES = $(TMPLOCAL_DEST)
+BUILT_SOURCES = $(shell ls *.msg |grep -v libAB |sed -e 's/.msg/.cat/g')
 CLEANFILES = $(BUILT_SOURCES)
 
+msgcatdir = $(CDE_INSTALLATION_TOP)/lib/nls/msg/$(LANG)
+dist_msgcat_DATA = $(BUILT_SOURCES)
+
 SUFFIXES = .msg .cat
 
 .msg.cat: