Merge branch 'master' into autotools-conversion

cde/admin/IntegTools/dbTools/installCDE.src

@@ -52,7 +52,7 @@ LOGFILE="installCDE.$$.log"
 
 Log()
 {
-  /bin/echo "$1" | tee -a $LOGFILE
+  echo "$1" | tee -a $LOGFILE
 }
 
 MakeTarball()
@@ -537,14 +537,7 @@ XCOMM
     PLATFORM_SCRIPT_DIR=hp
   fi
 
-  if [ "$PLATFORM" = "aix" ];
-  then
-    USER=$(/bin/whoami)
-  else
-    USER=$(/usr/bin/whoami)
-  fi
-
-  if [ "$USER" != "root" ];
+  if [ $(whoami) != "root" ];
   then
     echo ""
     echo "You should be root to run this script.  Continuing anyway."

cde/admin/IntegTools/dbTools/mkProd

@@ -96,13 +96,6 @@ else                                                # Build system = HP
         PLATFORM=hp-ux
 fi
 
-if [ $PLATFORM = "aix" ];
-then
-        USER=`/bin/whoami`
-else
-        USER=`/usr/bin/whoami`
-fi
-
 awkit() {
 	awk  '
 	BEGIN {
@@ -504,7 +497,7 @@ doit()
 		}
 		# set permissions for non-links
 		if [ "${TYPE%link}" = "$TYPE" ]; then
-			if [ "$USER" = "root" ]; then
+			if [ $(whoami) = "root" ]; then
 				chgrp $GROUP $DEST || 
 					echo "ERROR: \"chgrp $GROUP $DEST\" failed" >&2
 				chown $OWNER $DEST || 

cde/lib/tt/bin/tt_type_comp/Imakefile

@@ -8,7 +8,9 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include "../../tooltalk.tmpl"
 
-DEFINES = 
+CPP_PROGRAM = CppCmd
+CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
+DEFINES = $(CPP_DEFINES)
 INCLUDES = $(TIRPCINC) -I../../lib -I../../slib
 
 DEPLIBS         = ../../slib/libstt.a TtClientDepLibs

cde/lib/tt/lib/tt_options.h

@@ -529,4 +529,9 @@
 
 #endif
 
+#ifdef CPP_PROGRAM
+# undef OPT_CPP_PATH
+# define OPT_CPP_PATH CPP_PROGRAM
+#endif
+
 #endif				/* _TT_OPTIONS_H */

cde/programs/dtdocbook/instant/main.c

@@ -359,7 +359,7 @@ static int DefaultOutputString(ClientData clientData,
 
     /* leave room for worst case expansion plus quotes plus null */
     pArgv = argv[1];
-    stringLength = (3 * strlen(pArgv)) + 3;
+    stringLength = (4 * strlen(pArgv)) + 3;
 
     string = Tcl_Alloc(stringLength);
     memset(string, 0, stringLength);