From d2c0ceaaf60b43c52a5fdbafc6c69d0dbc95e61c Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Fri, 31 Aug 2012 16:31:26 -0600
Subject: [PATCH 1/2] linux.cf: add some gcc system include paths to
 makedepend.  Shaves about 5150 more warnings off (makedepend) :)

This is on ubuntu.  You may wany to add additional -I... entries for
other linux systems, if the ones I added for i386 and x86_64 don't
help.
---
 cde/config/cf/linux.cf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index b140fb2cd..c277ce986 100644
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -91,7 +91,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define SetTtyGroup		YES
 
 #define CcCmd			gcc -g -pipe
-#define CplusplusCmd		g++ -g -pipe -fpermissive 
+#define CplusplusCmd		g++ -g -pipe -fpermissive
 #define AsCmd			as
 #define LdCmd			ld
 
@@ -169,6 +169,8 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define HasPlugin		YES
 #define VendorHasX11R6_3libXext	YES	/* XC or XFree86 3.3.1 */
 #endif
+/* add this to void screenfuls of warnings from makedepend */
+#define DependFlags -I/usr/include/i386-linux-gnu
 #endif /* i386Architecture */
 
 #ifdef AMD64Architecture
@@ -181,6 +183,8 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define HasPlugin		YES
 #define VendorHasX11R6_3libXext	YES	/* XC or XFree86 3.3.1 */
 #endif
+/* add this to void screenfuls of warnings from makedepend */
+#define DependFlags -I/usr/include/x86_64-linux-gnu
 #endif /* AMD64Architecture */
 
 #ifdef PpcArchitecture

From 2d3517ec6e0c41c6e2b1338963892a254c784154 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Fri, 31 Aug 2012 19:57:29 -0600
Subject: [PATCH 2/2] installCDE: remove \c from installing... Log lines

---
 cde/admin/IntegTools/dbTools/installCDE.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
index f6b427adc..8e64bef64 100755
--- a/cde/admin/IntegTools/dbTools/installCDE.src
+++ b/cde/admin/IntegTools/dbTools/installCDE.src
@@ -492,10 +492,10 @@ XCOMM don't bother if the fileset doesn't exist
   Log "      - creating ${2}.lst file"
   KORNSHELL $TOOL_DIR/udbToAny.ksh  -toLst -ReleaseStream $PLATFORM \
             $DATABASE_DIR/${2}.udb >  /tmp/${2}.lst
-  Log "      - installing ... \c"
+  Log "      - installing ... "
   KORNSHELL $TOOL_DIR/mkProd -D / -S $BUILD_TREE /tmp/${2}.lst \
             2>/tmp/${2}.err 1>/tmp/${2}.good
-  Log "done."
+  Log "        done."
 
   Log "      - checking for errors ..."
   rm -f /tmp/${2}.missing