external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into autotools-conversion

Browse source
This commit is contained in:
Jon Trulson 2019-12-01 13:31:21 -07:00
commit e481f4cb93
5 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cde/admin/IntegTools/dbTools/installCDE.src
View file

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

9
cde/admin/IntegTools/dbTools/mkProd
View file

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

4
cde/lib/tt/bin/tt_type_comp/Imakefile
View file

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

5
cde/lib/tt/lib/tt_options.h
View file

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

2
cde/programs/dtdocbook/instant/main.c
View file

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