doc: move C to en_US.UTF-8.

cde/doc/C/Imakefile

@@ -1,28 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/07/23 22:00:00 rws $
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-/* due to split-VOB setup, force help to come last in make Makefiles */
-SUBDIRS = man guides m-guides help
-BSUBDIRS = help man guides m-guides
-
-XCOMM work around local clearcase vobs setup
-MakeDirectories(all,help-sdl cde.dti)
-
-XCOMM We need to build Motif documentation as part of CDE
-MakeDirectories(Makefiles,m-guides)
-Makefiles::
-	$(RM) -r m-guides/?*; \
-	cd m-guides; \
-	if test -f ../$(MDOCSRC)/C/guides/bookcase.bc; \
-	then $(LN) ../$(MDOCSRC)/C/guides/?* .; \
-	else $(CP) /dev/null ./Imakefile; \
-	     $(MKDIRHIER) ./common; \
-	     $(LN) ../../guides/common/ManLinksMotif.sgm common/ManLinks.sgm; \
-	fi; \
-	cd ..
-
-MakeSubdirs($(BSUBDIRS))
-
-clean::
-	$(RM) -r help-sdl cde.dti

cde/doc/Makefile.am

@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = util C
+SUBDIRS = en_US.UTF-8
 
 if GERMAN
 SUBDIRS += de_DE.ISO8859-1

cde/doc/common/guides/man.am

@@ -6,7 +6,7 @@ MAN_SRCS1 = \
     man/ref1m.sgm     man/ref6.sgm      man/refcsa.sgm \
     man/ref4.sgm      man/refDtFcn.sgm  man/reftt.sgm \
     common/ManLinks.sgm \
-    ../../../doc/C/guides/common/ManLinks.sgm
+    ../../../doc/en_US.UTF-8/guides/common/ManLinks.sgm
 
 MAN_SRCS2 = \
     man/m3_Dt/ActionCa.sgm  man/m3_Dt/MmdbBGST.sgm \

cde/doc/en_US.UTF-8/Imakefile

@@ -1 +1,28 @@
 XCOMM $XConsortium: Imakefile /main/10 1996/07/23 22:00:00 rws $
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+/* due to split-VOB setup, force help to come last in make Makefiles */
+SUBDIRS = man guides m-guides help
+BSUBDIRS = help man guides m-guides
+
+XCOMM work around local clearcase vobs setup
+MakeDirectories(all,help-sdl cde.dti)
+
+XCOMM We need to build Motif documentation as part of CDE
+MakeDirectories(Makefiles,m-guides)
+Makefiles::
+	$(RM) -r m-guides/?*; \
+	cd m-guides; \
+	if test -f ../$(MDOCSRC)/C/guides/bookcase.bc; \
+	then $(LN) ../$(MDOCSRC)/C/guides/?* .; \
+	else $(CP) /dev/null ./Imakefile; \
+	     $(MKDIRHIER) ./common; \
+	     $(LN) ../../guides/common/ManLinksMotif.sgm common/ManLinks.sgm; \
+	fi; \
+	cd ..
+
+MakeSubdirs($(BSUBDIRS))
+
+clean::
+	$(RM) -r help-sdl cde.dti

cde/doc/en_US.UTF-8/guides/Makefile.am

@@ -10,7 +10,7 @@ BUILT_SOURCES =
 CLEANFILES =
 
 # this sets the LANG and HELP_LANG variables
-include $(top_srcdir)/programs/localized/templates/C.am
+include $(top_srcdir)/programs/localized/templates/English.am
 
 # build guide TOCs and deps
 include $(top_srcdir)/doc/common/guides/usersGuide.am
@@ -71,8 +71,7 @@ dist_cdedtidocsearch_DATA = ../cde.dti/CDEDOC/dtsearch/CDEDOC.d00	\
 BUILT_SOURCES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA)
 CLEANFILES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA)
 
-# link the C version to en_US.UTF-8
+# link the en_US.UTF-8 version to C
 install-data-hook:
-	$(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib/en_US.UTF-8
-	cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib && $(LN_S) C en_US.UTF-8
-
+	$(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib/C
+	cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib && $(LN_S) en_US.UTF-8 C