From: Jon Trulson <jon@radscan.com>
Date: Tue, 24 Jul 2012 23:53:57 +0000 (-0600)
Subject: localized/templates: remove remaining attempts at building dtinfo related catalogs... 
X-Git-Tag: 2.2.0a~8^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ff0dc919ed59aec57dd7dea5fd40da042606a8fe;p=oweals%2Fcde.git

localized/templates: remove remaining attempts at building dtinfo related catalogs and other files

Attempts were still being made to build dtinfo.cat and other related
dtinfo files.  This could cause build failures in
programs/localized/...
---

diff --git a/cde/programs/localized/templates/app-defaults.tmpl b/cde/programs/localized/templates/app-defaults.tmpl
index b0e14be8..c835823e 100644
--- a/cde/programs/localized/templates/app-defaults.tmpl
+++ b/cde/programs/localized/templates/app-defaults.tmpl
@@ -8,6 +8,13 @@ SHELL=/bin/ksh
 .NO_PARALLEL:
 #endif
 
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
+DTINFO=
+#else
+DTINFO="Dtinfo"
+#endif
+
 OBJS =  \
         Dthelpview  \
         Dtimsstart  \
@@ -26,7 +33,7 @@ OBJS =  \
 	Dtterm \
 	Dtmail \
 	Dtbuilder \
-	Dtinfo \
+	$(DTINFO) \
 	Dtudcfonted \
         Dt
 
@@ -49,7 +56,10 @@ 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)
+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)
 
@@ -70,7 +80,10 @@ DtstyleDescRule(Dtcm,Dtcm)
 DtstyleDescRule(Dtterm,Dtterm)
 DtstyleDescRule(Dtmail,Dtmail)
 DtstyleDescRule(Dtbuilder,Dtbuilder)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+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 b0ae5cb4..aa1a88dd 100644
--- a/cde/programs/localized/templates/msg.C.tmpl
+++ b/cde/programs/localized/templates/msg.C.tmpl
@@ -8,6 +8,14 @@ SHELL=/bin/ksh
 .NO_PARALLEL:
 #endif
 
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
+DTINFOCATS=
+#else
+DTINFOCATS="dtinfo.cat dtinfo_start.cat"
+#endif
+
+
 OBJS= \
       Xm.cat		\
       Mrm.cat		\
@@ -34,8 +42,7 @@ OBJS= \
       dthelpprint.cat	\
       dticon.cat	\
       dtimsstart.cat	\
-      dtinfo.cat	\
-      dtinfo_start.cat	\
+      $(DTINFOCATS)	\
       dtksh.cat		\
       dtlogin.cat	\
       dtlp.cat		\
@@ -86,8 +93,11 @@ 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)
+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 f8315d73..f20d2097 100644
--- a/cde/programs/localized/templates/types.tmpl
+++ b/cde/programs/localized/templates/types.tmpl
@@ -4,6 +4,13 @@ XCOMM $TOG: types.tmpl /main/9 1998/08/05 18:05:45 mgreess $
 SHELL=/bin/ksh
 #endif
 
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
+DTINFODT=
+#else
+DTINFODT="dtinfo.dt"
+#endif
+
 OBJS1 =  \
 	autoStart.dt \
 	user-prefs.dt  \
@@ -14,7 +21,7 @@ OBJS1 =  \
 	dtappman.dt  \
 	dtfile.dt  \
 	dtims.dt \
-	dtinfo.dt  \
+	$(DTINFODT) \
 	dtpad.dt  \
 	xclients.dt  \
 	dthelp.dt  \
@@ -56,7 +63,10 @@ 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)
+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)
@@ -89,7 +99,10 @@ 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)
+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)
@@ -121,7 +134,10 @@ 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)
+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)