dtinfo activation

diff --git a/cde/doc/C/Imakefile b/cde/doc/C/Imakefile
index 4595a26a3f5bb83187d0b3a2d24cd39aa52af01b..7635914d26349a43c503c53bfa76eb008cfa9747 100644 (file)
--- a/cde/doc/C/Imakefile
+++ b/cde/doc/C/Imakefile
@@ -3,14 +3,8 @@ XCOMM $XConsortium: Imakefile /main/10 1996/07/23 22:00:00 rws $
 #define PassCDebugFlags
 
 /* due to split-VOB setup, force help to come last in make Makefiles */
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
-XCOMM we cannot build guides on linux yet
-SUBDIRS = man help
-BSUBDIRS = help man 
-#else
 SUBDIRS = man guides m-guides help
 BSUBDIRS = help man guides m-guides
-#endif
 
 XCOMM work around local clearcase vobs setup
 MakeDirectories(all,help-sdl cde.dti)
@@ -20,7 +14,11 @@ MakeDirectories(Makefiles,m-guides)
 Makefiles::
        $(RM) m-guides/?*; \
        cd m-guides; \
-       $(LN) ../$(MDOCSRC)/C/guides/?* .; \
+       if test -f ../$(MDOCSRC)/C/guides/bookcase.bc; \
+       then $(LN) ../$(MDOCSRC)/C/guides/?* .; \
+       else $(CP) /dev/null ./Imakefile; \
+            $(LN) ../$(MDOCSRC)/C/guides/common .; \
+       fi; \
        cd ..
 
 MakeSubdirs($(BSUBDIRS))

diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index b95ee859abf0174931b0b01a1008b90dca658eb7..ef1abd63556253cfa8294163336f387e51612fe6 100644 (file)
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -10,11 +10,11 @@ EXTRADIRS = types localized tttypes $(NSGMLSDIR) util
 XCOMM some of these cannot be built on linux yet.
 XCOMM dtinfo
 #if defined(LinuxArchitecture)
-DTINFODIR = 
+DTINFODIR = dtinfo
 #elif defined(OpenBSDArchitecture)
-DTINFODIR = 
+DTINFODIR = dtinfo
 #elif defined(FreeBSDArchitecture)
-DTINFODIR =
+DTINFODIR = dtinfo
 #else
 DTINFODIR = dtinfo
 #endif

diff --git a/cde/programs/localized/templates/app-defaults.tmpl b/cde/programs/localized/templates/app-defaults.tmpl
index 9198b020413574c8c8d68c18b2390c4a829b95b3..6b03d380e6ce25911ca036c3e7d9b588eb08fad2 100644 (file)
--- a/cde/programs/localized/templates/app-defaults.tmpl
+++ b/cde/programs/localized/templates/app-defaults.tmpl
@@ -8,12 +8,6 @@ SHELL=/bin/ksh
 .NO_PARALLEL:
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
-XCOMM no dtinfo for linux/fbsd
-DTINFO=
-#else
-DTINFO="Dtinfo"
-#endif
 
 OBJS =  \
         Dthelpview  \
@@ -33,7 +27,7 @@ OBJS =  \
        Dtterm \
        Dtmail \
        Dtbuilder \
-       $(DTINFO) \
+       Dtinfo \
        Dtudcfonted \
         Dt
 
@@ -56,10 +50,7 @@ LinkFile(Dtcm.nls,$(CDESRC)/dtcm/dtcm/Dtcm.ad)
 LinkFile(Dtterm.nls,$(CDESRC)/dtterm/Dtterm.ad)
 LinkFile(Dtmail.nls,$(CDESRC)/dtmail/dtmail/Dtmail)
 LinkFile(Dtbuilder.nls,$(CDESRC)/dtappbuilder/src/ab/Dtbuilder.ad)
-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && !defined(OpenBSDArchitecture)
-XCOMM no dtinfo for linux/fbsd
 LinkFile(Dtinfo.nls,$(CDESRC)/dtinfo/dtinfo/src/Dtinfo)
-#endif
 LinkFile(Dtudcfonted.nls,$(CDESRC)/dtudcfonted/resource/Dtudcfonted)
 LinkFile(Dt.nls,$(DTSVCSRC)/DtUtil2/Dt.ad)
 
@@ -80,10 +71,7 @@ DtstyleDescRule(Dtcm,Dtcm)
 DtstyleDescRule(Dtterm,Dtterm)
 DtstyleDescRule(Dtmail,Dtmail)
 DtstyleDescRule(Dtbuilder,Dtbuilder)
-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && !defined(OpenBSDArchitecture)
-XCOMM no dtinfo for linux/fbsd
 DtstyleDescRule(Dtinfo,Dtinfo)
-#endif
 DtstyleDescRule(Dtudcfonted,Dtudcfonted)
 DtstyleDescRule(Dt,Dt)
 

diff --git a/cde/programs/localized/templates/msg.C.tmpl b/cde/programs/localized/templates/msg.C.tmpl
index 61f144a88de31663b18f9aa5c0cf271d6924183c..cea9b1834c07ad63b03d6ec869297cb08a7ccf21 100644 (file)
--- a/cde/programs/localized/templates/msg.C.tmpl
+++ b/cde/programs/localized/templates/msg.C.tmpl
@@ -8,13 +8,6 @@ SHELL=/bin/ksh
 .NO_PARALLEL:
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
-XCOMM no dtinfo for linux/fbsd
-DTINFOCATS=
-#else
-DTINFOCATS="dtinfo.cat dtinfo_start.cat"
-#endif
-
 
 OBJS= \
       Xm.cat           \
@@ -42,7 +35,8 @@ OBJS= \
       dthelpprint.cat  \
       dticon.cat       \
       dtimsstart.cat   \
-      $(DTINFOCATS)    \
+      dtinfo.cat       \
+      dtinfo_start.cat \
       dtksh.cat                \
       dtlogin.cat      \
       dtlp.cat         \
@@ -94,11 +88,8 @@ LinkFile(dthelpgen.msg,$(CDESRC)/dthelp/dthelpgen/dthelpgen.msg)
 LinkFile(dthelpprint.msg,$(CDESRC)/dthelp/dthelpprint/dthelpprint.msg)
 LinkFile(dticon.msg,$(CDESRC)/dticon/dticon.msg)
 LinkFile(dtimsstart.msg,$(CDESRC)/dtimsstart/dtimsstart.msg)
-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && !defined(OpenBSDArchitecture)
-XCOMM no dtinfo for linux/fbsd
 LinkFile(dtinfo.msg,$(CDESRC)/dtinfo/dtinfo/src/dtinfo.msg.updated)
 LinkFile(dtinfo_start.msg,$(CDESRC)/dtinfo/clients/dtinfo_start/dtinfo_start.msg)
-#endif
 LinkFile(dtksh.msg,$(CDESRC)/dtksh/dtksh.msg)
 LinkFile(dtlogin.msg,$(CDESRC)/dtlogin/dtlogin.msg)
 LinkFile(dtlp.msg,$(CDESRC)/dtprintegrate/dtlp.msg)

diff --git a/cde/programs/localized/templates/types.tmpl b/cde/programs/localized/templates/types.tmpl
index 4deea4a3c9654f34cdf3b604e9b0588b1e51a6f8..957a62b318aa323fe9c7a9aefd47035cd010044e 100644 (file)
--- a/cde/programs/localized/templates/types.tmpl
+++ b/cde/programs/localized/templates/types.tmpl
@@ -4,12 +4,6 @@ XCOMM $TOG: types.tmpl /main/9 1998/08/05 18:05:45 mgreess $
 SHELL=/bin/ksh
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
-XCOMM no dtinfo for linux/fbsd
-DTINFODT=
-#else
-DTINFODT="dtinfo.dt"
-#endif
 
 OBJS1 =  \
        autoStart.dt \
@@ -21,7 +15,7 @@ OBJS1 =  \
        dtappman.dt  \
        dtfile.dt  \
        dtims.dt \
-       $(DTINFODT) \
+       dtinfo.dt \
        dtpad.dt  \
        xclients.dt  \
        dthelp.dt  \
@@ -63,10 +57,7 @@ LinkFile(datatypes.dt.nls,$(CDESRC)/types/datatypes.dt)
 LinkFile(dtappman.dt.nls,$(CDESRC)/types/dtappman.dt)
 LinkFile(dtfile.dt.nls,$(CDESRC)/types/dtfile.dt)
 LinkFile(dtims.dt.nls,$(CDESRC)/types/dtims.dt)
-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && !defined(OpenBSDArchitecture)
-XCOMM no dtinfo for linux/fbsd
 LinkFile(dtinfo.dt.nls,$(CDESRC)/types/dtinfo.dt)
-#endif
 LinkFile(dtpad.dt.nls,$(CDESRC)/types/dtpad.dt)
 LinkFile(xclients.dt.nls,$(CDESRC)/types/xclients.dt)
 LinkFile(dthelp.dt.nls,$(CDESRC)/types/dthelp.dt)
@@ -99,10 +90,7 @@ LinkFile(datatypes.dt.tmsg,_common.dt.tmsg)
 LinkFile(dtappman.dt.tmsg,_common.dt.tmsg)
 LinkFile(dtfile.dt.tmsg,_common.dt.tmsg)
 LinkFile(dtims.dt.tmsg,_common.dt.tmsg)
-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && !defined(OpenBSDArchitecture)
-XCOMM no dtinfo for linux/fbsd
 LinkFile(dtinfo.dt.tmsg,_common.dt.tmsg)
-#endif
 LinkFile(dtpad.dt.tmsg,_common.dt.tmsg)
 LinkFile(xclients.dt.tmsg,_common.dt.tmsg)
 LinkFile(dthelp.dt.tmsg,_common.dt.tmsg)
@@ -134,10 +122,7 @@ DtstyleDescRule(datatypes.dt,datatypes.dt)
 DtstyleDescRule(dtappman.dt,dtappman.dt)
 DtstyleDescRule(dtfile.dt,dtfile.dt)
 DtstyleDescRule(dtims.dt,dtims.dt)
-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && !defined(OpenBSDArchitecture)
-XCOMM no dtinfo for linux/fbsd
 DtstyleDescRule(dtinfo.dt,dtinfo.dt)
-#endif
 DtstyleDescRule(dtpad.dt,dtpad.dt)
 DtstyleDescRule(xclients.dt,xclients.dt)
 DtstyleDescRule(dthelp.dt,dthelp.dt)