merge from 6.0.1 branch
diff --git a/Make-config b/Make-config
index 3e4b985..2b2362f 100644
--- a/Make-config
+++ b/Make-config
@@ -340,6 +340,7 @@
"CXX = aCC" \
"CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
"CXXFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE" \
+ "MKLIB_OPTIONS = -static" \
"APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -L/usr/lib -lCsup"
hpux10-sl:
diff --git a/bin/mklib b/bin/mklib
index ef6dd12..e7931e4 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -290,14 +290,14 @@
'HP-UX')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
- echo "mklib: Making HPUX static library: " ${LIBNAME}
+ echo "mklib: Making HP-UX static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar -ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
RUNLIB="lib${LIBNAME}.${MAJOR}"
DEVLIB="lib${LIBNAME}.sl"
- echo "mklib: Making HPUX stared library: " ${RUNLIB} ${DEVLIB}
+ echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB}
ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS}
ln -s ${RUNLIB} ${DEVLIB}
FINAL_LIBS="{RUNLIB} ${DEVLIB}"