diff --git a/samples/CreateDOMDocument/Makefile.in b/samples/CreateDOMDocument/Makefile.in
index 669af198b936ef4a2f401f97de7778509f8fc889..d0171b8de0fbe7b5937488e39b8bcefedc32ddec 100644
--- a/samples/CreateDOMDocument/Makefile.in
+++ b/samples/CreateDOMDocument/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=CreateDOMDocument
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/CreateDOMDocument.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
## OS390BATCH
ifeq (${OS390BATCH},1)
diff --git a/samples/DOMCount/Makefile.in b/samples/DOMCount/Makefile.in
index 21eb384c1ae1e2f09ce3a9e260b2a2c8955e5af4..8e8a3c243138035dbdcfcd265eb70da70d5a6964 100644
--- a/samples/DOMCount/Makefile.in
+++ b/samples/DOMCount/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=DOMCount
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/DOMCount.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
## OS390BATCH
ifeq (${OS390BATCH},1)
diff --git a/samples/DOMPrint/Makefile.in b/samples/DOMPrint/Makefile.in
index 4d019af5d31970e2a64eee2ef503b7584d746fd5..3ad24083001ee4b6a4a4ea89387068c845e436b1 100644
--- a/samples/DOMPrint/Makefile.in
+++ b/samples/DOMPrint/Makefile.in
@@ -79,15 +79,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=DOMPrint
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/DOMPrint.o ${OUTDIR}/DOMTreeErrorReporter.o ${OUTDIR}/DOMPrintFilter.o ${OUTDIR}/DOMPrintErrorHandler.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=${SRC}/DOMTreeErrorReporter.hpp ${SRC}/DOMPrintFilter.hpp ${SRC}/DOMPrintErrorHandler.hpp
## OS390BATCH
diff --git a/samples/EnumVal/Makefile.in b/samples/EnumVal/Makefile.in
index ead2b86a834e9a114a20c4b7940746997b5954ee..6ee699fed3a7871b3f405058c90b5c49d62d290b 100644
--- a/samples/EnumVal/Makefile.in
+++ b/samples/EnumVal/Makefile.in
@@ -77,15 +77,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=EnumVal
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/EnumVal.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=
## OS390BATCH
diff --git a/samples/Makefile.incl b/samples/Makefile.incl
index 654baeea47995de5d8f10231bb4444fa47cd3120..fa7788ccf21166b06fbaa73a1337d36c9c5ec950 100644
--- a/samples/Makefile.incl
+++ b/samples/Makefile.incl
@@ -74,6 +74,10 @@ THISLIB=${LIB_DIR}/${LIBNAME}
LIBRARY_NAMES=-l${LIBNAME}
LIBRARY_SEARCH_PATHS=-L${LIB_DIR}
+ifndef XERCESCOUT
+XERCESCOUT=${XERCESCROOT}
+endif
+
TO = o
####################### PLATFORM DEPENDENCIES #####################
@@ -293,7 +297,7 @@ endif
# export LOADMOD=USERID.LOAD #
# export LOADEXP=SYS1.SIXMEXP or &hlq.SIXMEXP #
# #
-# to specify your LOADMOD and the IXM4C51X definition sidedeck #
+# to specify your LOADMOD and the IXM4C52X definition sidedeck #
# dataset. #
###################################################################
@@ -312,7 +316,7 @@ SHLIBSUFFIX=.dll
OS390SIDEDECK=.x
## OS390BATCH
ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C51X)'"
+LIBRARY_NAMES="//'${LOADEXP}(IXM4C52X)'"
else
LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
endif
diff --git a/samples/MemParse/Makefile.in b/samples/MemParse/Makefile.in
index dec8c03a8e7c89a8b1f6b47dec1b887d205e0bda..7a85753a6f1d46fdba9f4590b8e2e04781c3b88a 100644
--- a/samples/MemParse/Makefile.in
+++ b/samples/MemParse/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=MemParse
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/MemParse.o ${OUTDIR}/MemParseHandlers.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES= ${SRC}/MemParse.hpp ${SRC}/MemParseHandlers.hpp
## OS390BATCH
diff --git a/samples/PParse/Makefile.in b/samples/PParse/Makefile.in
index 0eae7df548e09034baef897d9efcd3d928094ae3..af04ad41b7134c3e5913d0f635672dd0a03b6c14 100644
--- a/samples/PParse/Makefile.in
+++ b/samples/PParse/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=PParse
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/PParse.o ${OUTDIR}/PParseHandlers.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=${SRC}/PParse.hpp ${SRC}/PParseHandlers.hpp
## OS390BATCH
diff --git a/samples/Redirect/Makefile.in b/samples/Redirect/Makefile.in
index 46dcefc42a68000e0c3b87ad912c61a3bf5a1f0c..232026cf8e24d9dbdd1e1ebe9f7e3d600a421c4a 100644
--- a/samples/Redirect/Makefile.in
+++ b/samples/Redirect/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=Redirect
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/Redirect.o ${OUTDIR}/RedirectHandlers.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=${SRC}/Redirect.hpp ${SRC}/RedirectHandlers.hpp
## OS390BATCH
diff --git a/samples/SAX2Count/Makefile.in b/samples/SAX2Count/Makefile.in
index 296fc6a85498f98745a3a01bf5cf6674d46784f1..5c667623fe5ee58bf450ea9a4a91ae25e999592b 100644
--- a/samples/SAX2Count/Makefile.in
+++ b/samples/SAX2Count/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=SAX2Count
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/SAX2Count.o ${OUTDIR}/SAX2CountHandlers.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=${SRC}/SAX2Count.hpp ${SRC}/SAX2CountHandlers.hpp
## OS390BATCH
diff --git a/samples/SAX2Print/Makefile.in b/samples/SAX2Print/Makefile.in
index 3f7473c45f130d61d058b1092ed34225a43fafd8..2f6ad48307a70d730b56afb9fbbdc8a838cefca3 100644
--- a/samples/SAX2Print/Makefile.in
+++ b/samples/SAX2Print/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=SAX2Print
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/SAX2Print.o ${OUTDIR}/SAX2PrintHandlers.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=${SRC}/SAX2Print.hpp ${SRC}/SAX2PrintHandlers.hpp
## OS390BATCH
diff --git a/samples/SAXCount/Makefile.in b/samples/SAXCount/Makefile.in
index 0e3d62e2491b4f46257169a7b8bfafeb8a852d80..e0fd5c4b740571226e11cdd582d33442a460abc2 100644
--- a/samples/SAXCount/Makefile.in
+++ b/samples/SAXCount/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=SAXCount
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/SAXCount.o ${OUTDIR}/SAXCountHandlers.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=${SRC}/SAXCount.hpp ${SRC}/SAXCountHandlers.hpp
## OS390BATCH
diff --git a/samples/SAXPrint/Makefile.in b/samples/SAXPrint/Makefile.in
index 91faf30e099eaadb4f0968cebfa567b15b7686d5..534b6babc78e25936d90e346287f15c79e8f13f0 100644
--- a/samples/SAXPrint/Makefile.in
+++ b/samples/SAXPrint/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=SAXPrint
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/SAXPrint.o ${OUTDIR}/SAXPrintHandlers.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=${SRC}/SAXPrint.hpp ${SRC}/SAXPrintHandlers.hpp
## OS390BATCH
diff --git a/samples/SEnumVal/Makefile.in b/samples/SEnumVal/Makefile.in
index 28f07617cba253fadbde8fd711f5a661c55b5316..3e62e1a5efd8333ea114d05bbc41dab859ca4833 100644
--- a/samples/SEnumVal/Makefile.in
+++ b/samples/SEnumVal/Makefile.in
@@ -55,6 +55,9 @@
#
# $Id$
# $Log$
+# Revision 1.7 2003/07/28 20:02:41 neilg
+# fix to permit the samples source to be copied from a non-writable to a writable part of the filesystem, then compiled. Binaries will also be dropped in a writable directory. This should make experimentation easier on multi-user systems. Patch by Steve Dulin
+#
# Revision 1.6 2002/08/19 15:13:38 tng
# [Bug 11229] bogus -I statements order in CXXFLAGS.
#
@@ -93,15 +96,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=SEnumVal
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/SEnumVal.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=
## OS390BATCH
diff --git a/samples/StdInParse/Makefile.in b/samples/StdInParse/Makefile.in
index c5df2d037b3af2f91b0c21706c3d5cf8a6cb2471..4a1da0708ea9475590d6577a8a54ba61523427b9 100644
--- a/samples/StdInParse/Makefile.in
+++ b/samples/StdInParse/Makefile.in
@@ -78,15 +78,15 @@ THREADS = @threads@
EXTRA_LIBS = @extra_libs@
PREFIX = @prefix@
-include ../../version.incl
+include ${XERCESCROOT}/version.incl
include ../Makefile.incl
APP_NAME=StdInParse
-OUTDIR= ${XERCESCROOT}/bin/obj/${APP_NAME}
-EXEC= ${XERCESCROOT}/bin
+OUTDIR= ${XERCESCOUT}/bin/obj/${APP_NAME}
+EXEC= ${XERCESCOUT}/bin
OBJS= ${OUTDIR}/StdInParse.o ${OUTDIR}/StdInParseHandlers.o
-SRC= ${XERCESCROOT}/samples/${APP_NAME}
+SRC= ${XERCESCOUT}/samples/${APP_NAME}
HEADER_FILES=${SRC}/StdInParse.hpp ${SRC}/StdInParseHandlers.hpp
## OS390BATCH