Index: lang/javascript/javascript-xpath/trunk/Makefile
===================================================================
--- lang/javascript/javascript-xpath/trunk/Makefile (revision 1482)
+++ lang/javascript/javascript-xpath/trunk/Makefile (revision 1538)
@@ -3,5 +3,8 @@
 SRC_DIR = src
 
-TEST_DIR = test
+TEST_DIR = ${PREFIX}/test
+FUNC_TEST_DIR = ${TEST_DIR}/functional
+FUNC_TEST_DATA_DIR = ${FUNC_TEST_DIR}/data
+RAW_DATAS = $(wildcard ${FUNC_TEST_DATA_DIR}/0*)
 
 DIST_DIR = ${PREFIX}/dist
@@ -43,4 +46,7 @@
 VER = ${shell cat ${VERSION_FILE}}
 
+TESTDATA_LOCALJS = ${FUNC_TEST_DIR}/testdatas.js
+FUNCTEST_ORIGINAL = ${FUNC_TEST_DIR}/index.html
+FUNCTEST_NOXHR = ${FUNC_TEST_DIR}/index-no-xhr.html
 JSXPATH     = ${DIST_DIR}/javascript-xpath-${VER}.js
 JSXPATH_CMP = ${DIST_DIR}/javascript-xpath-${VER}-cmp.js
@@ -49,8 +55,15 @@
 	@@echo "JavaScript-XPath build complete"
 
-jsxpath: ${JSXPATH_CMP}
+jsxpath: ${JSXPATH_CMP} ${TESTDATA_LOCALJS} ${FUNCTEST_NOXHR}
 
 ${DIST_DIR}:
 	@@mkdir -p $@
+
+${TESTDATA_LOCALJS}:
+	@@sh ${TOOLS_DIR}/make-testdata-string.sh ${RAW_DATAS}
+	@@mv ${TOOLS_DIR}/dtmp.js ${TESTDATA_LOCALJS}
+
+${FUNCTEST_NOXHR}:
+	@@sed -e "s/<!--LOCAL_DATA_HERE-->/<script type=\"text\/javascript\" src=\"\.\/testdatas.js\"><\/script>/g" ${FUNCTEST_ORIGINAL} > ${FUNCTEST_NOXHR}
 
 ${JSXPATH}: ${DIST_DIR} ${VERSION_FILE} ${SRC_FILES} Makefile
@@ -78,2 +91,3 @@
 	@@rm ${DIST_DIR}/*
 
+