linux: move dependancy handling out of linux.cf and into new lnxDep.rules file.

[oweals/cde.git] / cde / config / cf / Motif.tmpl

diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl
index 6873de638637b6e8fbeea5b25df207f26bcd1d63..caa556d737d3fc69a083316e3b0396d1239a7155 100644 (file)
--- a/cde/config/cf/Motif.tmpl
+++ b/cde/config/cf/Motif.tmpl
@@ -442,12 +442,17 @@ TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC)
 /* MTOOLKITSRC  should be removed */
     MTOOLKITSRC = $(TOOLKITSRC)
 #if ImportMotif || UseInstalledMotif
-    MINCLUDESRC = $(MTOP)/include
         MDOCSRC = $(MTOP)/doc
         MLOCSRC = $(MTOP)/localized
 #else
-    MINCLUDESRC = $(MTOP)/exports/include
         MLOCSRC = $(MTOP)/exports/localized
+#endif
+#if defined(TopMotifInclude)
+    MINCLUDESRC = TopMotifInclude
+#elif ImportMotif || UseInstalledMotif
+    MINCLUDESRC = $(MTOP)/include
+#else
+    MINCLUDESRC = $(MTOP)/exports/include
 #endif
         MLIBSRC = $(MTOP)/lib
      MCLIENTSRC = $(MTOP)/clients
@@ -567,7 +572,7 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
        UILFLAGS = UilFlags
     GENCATFLAGS = GencatFlags
          GENCAT = GencatCmd $(GENCATFLAGS)
-      MKCATTOOL = $(MLOCSRC)/util/mkcatdefs
+      MKCATTOOL = $(TOP)/programs/localized/util/mkcatdefs
 
          RM_CMD = $(RM) FilesToClean ExtraFilesToClean TestExtraFilesToClean
 
@@ -577,7 +582,16 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
 # else
         DEPLIBS = $(LOCAL_LIBRARIES)
 # endif
-        DEPLIBS1 = $(DEPLIBS)
-        DEPLIBS2 = $(DEPLIBS)
-        DEPLIBS3 = $(DEPLIBS)
+       DEPLIBS1 = $(DEPLIBS)
+       DEPLIBS2 = $(DEPLIBS)
+       DEPLIBS3 = $(DEPLIBS)
 #endif /* NeedDefaultDepLibs */
+
+/* check for existence of Dtinfo Motif Documents */
+#if defined(LinuxArchitecture)
+      MOTIF_DOC = $(shell if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi)
+#elif defined(BSDArchitecture)
+     MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; else echo; fi
+#else
+      MOTIF_DOC = -D_MOTIFDOC_
+#endif