dtinfo other files

cde/config/cf/Imake.rules

@@ -2356,7 +2356,7 @@ target::								@@\
 #ifdef UseInstalled
 #define ImakeSubCmdHelper $(IMAKE_CMD)
 #else
-#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
+#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_DEF_DTINFO)
 #endif
 
 #endif /* MakeMakeSubdirs */

cde/config/cf/Motif.tmpl

@@ -582,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(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
+     MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi
+#else
+      MOTIF_DOC = -D_MOTIFDOC_
+#endif

cde/config/cf/OpenBSD.cf

@@ -149,6 +149,9 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 /*
  * Compiler Features
  */
+#ifndef HasGcc2ForCplusplus
+#define HasGcc2ForCplusplus	YES
+#endif
 #define GccUsesGas		YES
 #define UseGas			YES
 #define GnuCpp			YES
@@ -480,6 +483,8 @@ install:: fonts.alias							@@\
 
 # define HasAgpGart		YES
 
+# define LdPostLib		-L/usr/X11R6/lib -L/usr/local/lib
+
 # define ServerExtraSysLibs	-lamd64
 # define ServerExtraDefines	GccGasOption -D_XSERVER64 XFree86ServerDefines
 
@@ -495,6 +500,9 @@ install:: fonts.alias							@@\
 #  define HasX86Support		YES
 # endif
 
+/* For DtHelp TIFF processing routines. */
+#define LSBBitOrder		YES
+
 #endif /* AMD64Architecture */
 
 /*
@@ -542,13 +550,13 @@ install:: fonts.alias							@@\
 # ifndef DefaultGcc2i386Opt
 #   if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
       /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
-#     define DefaultGcc2i386Opt	-O2 GccAliasingArgs
+#     define DefaultGcc2i386Opt	-O2 -fno-strict-aliasing
 #   endif
 # endif
 # define OptimizedCDebugFlags	DefaultGcc2i386Opt
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraSysLibs	-li386
-# define LdPostLib		/**/
+# define LdPostLib		-L/usr/X11R6/lib -L/usr/local/lib
 # define ServerExtraDefines GccGasOption XFree86ServerDefines
 # ifndef XFree86ConsoleDefines
 #   define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
@@ -571,6 +579,9 @@ install:: fonts.alias							@@\
 #  define HasX86Support		UseElfFormat
 # endif
 
+/* For DtHelp TIFF processing routines. */
+#define LSBBitOrder		YES
+
 
 #endif /* i386Architecture */
 
@@ -891,10 +902,24 @@ install:: fonts.alias							@@\
  * which can be overridden by architecture specific sections above
  */
 
+#ifdef HasGcc2ForCplusplus
+CXXDEPENDINCLUDE != echo | `CcCmd -print-prog-name=cc1plus` -v 2>&1 | \
+		    sed -n 's/ \(.*[cg]++.*\)/-I\1/p'; rm -f gccdump.s
+#define CplusplusDependIncludes $(CXXDEPENDINCLUDE)
+#endif
+
 #ifndef StandardDefines
 # define StandardDefines	-DCSRG_BASED 
 #endif
 
+#ifndef StandardIncludes
+# define StandardIncludes	-I/usr/X11R6/include -I/usr/local/include
+#endif
+
+#ifndef TopMotifInclude
+# define TopMotifInclude	/usr/local/include
+#endif
+
 #if !defined(OptimizedCDebugFlags)
 # define OptimizedCDebugFlags	-O2
 #endif

cde/config/cf/X11.tmpl

@@ -741,14 +741,14 @@ XCOMM X Window System make variables; these need to be coordinated with rules
      XPROJECTROOT = X11ProjectRoot
 #endif
 
-#if UseInstalledX11
-              RGB = $(BINDIR)/rgb
-            FONTC = $(BINDIR)/bdftopcf
-        MKFONTDIR = $(BINDIR)/mkfontdir
-#elif defined(X11ProjectRoot)
+#if defined(X11ProjectRoot)
               RGB = $(XPROJECTROOT)/bin/rgb
             FONTC = $(XPROJECTROOT)/bin/bdftopcf
         MKFONTDIR = $(XPROJECTROOT)/bin/mkfontdir
+#elif UseInstalledX11
+              RGB = $(BINDIR)/rgb
+            FONTC = $(BINDIR)/bdftopcf
+        MKFONTDIR = $(BINDIR)/mkfontdir
 #else
               RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
             FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf

cde/config/cf/cde.rules

@@ -207,7 +207,7 @@ all:: infolib/bkcase/dtsearch/dtsearch.ocf				@@\
 infolib/bkcase/dtsearch/dtsearch.ocf: dep				@@\
 	MakeDir($(DTINFOGENTMPDIR))					@@\
 	MakeDir(infolib)						@@\
-	env $(DTINFOGEN) build -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -l infolib bookcase.bc
+	env $(DTINFOGEN) build -v -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -l infolib bookcase.bc
 #endif
 
 /*

cde/config/cf/lnxLib.tmpl

@@ -39,7 +39,7 @@ XMULIB = -lXmu $(XLIB)
 #endif
 
 #ifndef SharedCsaReqs
-# define SharedCsaReqs -lXt
+# define SharedCsaReqs -lXt $(TIRPCLIB)
 #endif
 
 #ifndef SharedDtHelpReqs

cde/config/cf/site.def

@@ -78,6 +78,12 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 # endif
 #endif
 
+#ifndef MotifProjectRoot
+# if defined(OpenBSDArchitecture)
+#  define MotifProjectRoot	/usr/local
+# endif
+#endif
+
 #ifndef ProjectRoot
 # define ProjectRoot	/usr/dt
 #endif