Index: namazu-2.0.7/nmz/Makefile.am
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/nmz/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 Makefile.am
--- namazu-2.0.7/nmz/Makefile.am	2001/09/07 07:59:10	1.1.1.1
+++ namazu-2.0.7/nmz/Makefile.am	2001/09/07 08:07:14
@@ -18,7 +18,7 @@
        -DHAVE_SUPPORT_H -DNO_ALLOCA \
        @DEFS@
 INCLUDES = -I$(srcdir) -I.. -I$(srcdir)/../lib -I$(srcdir)/../src \
-	-I$(srcdir)/../intl -I$(srcdir)/../nmz
+	-I$(top_builddir)/../intl -I$(srcdir)/../nmz
 
 pkginclude_HEADERS = codeconv.h field.h hlist.h i18n.h idxname.h \
 	libnamazu.h l10n-ja.h parser.h query.h re.h regex.h \
Index: namazu-2.0.7/src/Makefile.am
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/src/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 Makefile.am
--- namazu-2.0.7/src/Makefile.am	2001/09/07 07:59:11	1.1.1.1
+++ namazu-2.0.7/src/Makefile.am	2001/09/07 08:08:03
@@ -22,7 +22,7 @@
        -DOPT_INDEXDIR=\"$(indexdir)\" \
        -DHAVE_SUPPORT_H \
        @DEFS@
-INCLUDES  = -I.. -I$(srcdir)/../intl -I$(srcdir)/../lib -I$(srcdir)/../nmz
+INCLUDES  = -I.. -I$(top_builddir)/../intl -I$(srcdir)/../lib -I$(srcdir)/../nmz
 LDADD = @INTLLIBS@ $(top_builddir)/nmz/libnmz.la $(top_builddir)/lib/libnmzut.a 
 
 common_SOURCES = form.c form.h message.h \
Index: namazu-2.0.7/tests/Makefile.am
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 Makefile.am
--- namazu-2.0.7/tests/Makefile.am	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/Makefile.am	2001/09/07 09:11:56
@@ -2,20 +2,49 @@
 AUTOMAKE_OPTIONS = 1.4 no-dependencies
 SUBDIRS = data
 
-TESTS =	mknmz-1 mknmz-2 mknmz-3 mknmz-4 mknmz-5 \
-	mknmz-6 mknmz-7 mknmz-8 mknmz-9 mknmz-10 \
-	mknmz-11 mknmz-12 mknmz-13 mknmz-14 mknmz-15 \
-	mknmz-16 \
-	gcnmz-1 \
-	idxdiff-1 idxdiff-2 idxdiff-3 \
-	namazu-1 namazu-2 namazu-3 namazu-4 namazu-5 \
-	namazu-6 namazu-7 namazu-8 namazu-9 namazu-10 \
-	namazu-11 \
-	namazu-cgi-1 namazu-cgi-2 namazu-cgi-3 namazu-cgi-4 \
-	namazu-cgi-5 namazu-cgi-6 namazu-cgi-7 \
-	ja-mknmz-1 ja-namazu-cgi-1
+TESTS = \
+	$(srcdir)/mknmz-1 \
+	$(srcdir)/mknmz-2 \
+	$(srcdir)/mknmz-3 \
+	$(srcdir)/mknmz-4 \
+	$(srcdir)/mknmz-5 \
+	$(srcdir)/mknmz-6 \
+	$(srcdir)/mknmz-7 \
+	$(srcdir)/mknmz-8 \
+	$(srcdir)/mknmz-9 \
+	$(srcdir)/mknmz-10 \
+	$(srcdir)/mknmz-11 \
+	$(srcdir)/mknmz-12 \
+	$(srcdir)/mknmz-13 \
+	$(srcdir)/mknmz-14 \
+	$(srcdir)/mknmz-15 \
+	$(srcdir)/mknmz-16 \
+	$(srcdir)/gcnmz-1 \
+	$(srcdir)/idxdiff-1 \
+	$(srcdir)/idxdiff-2 \
+	$(srcdir)/idxdiff-3 \
+	$(srcdir)/namazu-1 \
+	$(srcdir)/namazu-2 \
+	$(srcdir)/namazu-3 \
+	$(srcdir)/namazu-4 \
+	$(srcdir)/namazu-5 \
+	$(srcdir)/namazu-6 \
+	$(srcdir)/namazu-7 \
+	$(srcdir)/namazu-8 \
+	$(srcdir)/namazu-9 \
+	$(srcdir)/namazu-10 \
+	$(srcdir)/namazu-11 \
+	$(srcdir)/namazu-cgi-1 \
+	$(srcdir)/namazu-cgi-2 \
+	$(srcdir)/namazu-cgi-3 \
+	$(srcdir)/namazu-cgi-4 \
+	$(srcdir)/namazu-cgi-5 \
+	$(srcdir)/namazu-cgi-6 \
+	$(srcdir)/namazu-cgi-7 \
+	$(srcdir)/ja-mknmz-1 \
+	$(srcdir)/ja-namazu-cgi-1
 
 clean-local:
 	rm -rf test-log tmp-data tmp.* idx[0-9]* ja-idx[0-9]*
 
-EXTRA_DIST = $(TESTS) select-data
+EXTRA_DIST = $(TESTS) $(top_srcdir)/select-data
Index: namazu-2.0.7/tests/gcnmz-1
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/gcnmz-1,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 gcnmz-1
--- namazu-2.0.7/tests/gcnmz-1	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/gcnmz-1	2001/09/07 11:47:30
@@ -3,7 +3,7 @@
 # Test for gcnmz.
 #
 LOG=`pwd`/test-log
-TARGET=`./select-data`
+TARGET=`$srcdir/select-data`
 TMPDATA=`pwd`/tmp-data
 
 if test ! -d idx5; then
Index: namazu-2.0.7/tests/mknmz-1
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-1,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-1
--- namazu-2.0.7/tests/mknmz-1	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-1	2001/09/07 11:45:01
@@ -3,7 +3,7 @@
 # Test for simple indexing.
 #
 LOG=`pwd`/test-log
-TARGET=`./select-data`
+TARGET=`$srcdir/select-data`
 
 if test ! -d idx1; then
     mkdir idx1
Index: namazu-2.0.7/tests/mknmz-10
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-10,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-10
--- namazu-2.0.7/tests/mknmz-10	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-10	2001/09/07 11:45:15
@@ -4,7 +4,7 @@
 #
 
 LOG=`pwd`/test-log
-TARGET=`./select-data`
+TARGET=`$srcdir/select-data`
 
 if test ! -d idx12; then
     mkdir idx12
Index: namazu-2.0.7/tests/mknmz-11
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-11,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-11
--- namazu-2.0.7/tests/mknmz-11	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-11	2001/09/07 12:28:21
@@ -14,9 +14,9 @@
 fi
 
 if test ! -h $TARGET; then
-    ln -s `pwd`/data/en $TARGET
+    ln -s $srcdir/data/en $TARGET
 fi
-TXTCOUNT=`ls ./data/symlink/*.txt|wc -l`
+TXTCOUNT=`ls $srcdir/data/symlink/*.txt|wc -l`
 
 cd ../scripts
 ./mknmz --allow='.*.txt' -O ../tests/$IDXDIR $TARGET >> $LOG 2>&1
Index: namazu-2.0.7/tests/mknmz-12
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-12,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-12
--- namazu-2.0.7/tests/mknmz-12	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-12	2001/09/07 12:39:33
@@ -4,10 +4,10 @@
 #
 
 LOG=`pwd`/test-log
-TARGET=`pwd`/data/filter
+TARGET=$srcdir/data/filter
 IDXDIR=idx15
-TXTCOUNT=`ls ./data/filter/*.txt|wc -l`
-FDIR=`pwd`/data/filter
+TXTCOUNT=`ls $srcdir/data/filter/*.txt|wc -l`
+FDIR=$srcdir/data/filter
 MKNMZRC=`pwd`/mknmzrc-mknmz12
 export MKNMZRC
 
Index: namazu-2.0.7/tests/mknmz-15
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-15,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-15
--- namazu-2.0.7/tests/mknmz-15	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-15	2001/09/07 12:36:47
@@ -3,7 +3,7 @@
 # Test for duplicated field.
 #
 LOG=`pwd`/test-log
-TARGET=`pwd`/data/dup-field
+TARGET=$srcdir/data/dup-field
 IDX=idx18
 CONF=`pwd`/tmp.mknmzrc
 
Index: namazu-2.0.7/tests/mknmz-2
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-2,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-2
--- namazu-2.0.7/tests/mknmz-2	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-2	2001/09/07 11:41:45
@@ -3,7 +3,7 @@
 # Test for incremental indexing.
 #
 LOG=`pwd`/test-log
-TARGET=`./select-data`
+TARGET=`$srcdir/select-data`
 
 if test ! -d idx2; then
     mkdir idx2
Index: namazu-2.0.7/tests/mknmz-3
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-3,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-3
--- namazu-2.0.7/tests/mknmz-3	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-3	2001/09/07 11:42:59
@@ -3,7 +3,7 @@
 # Test for indexing with --checkpoint and $ON_MEMORY_MAX is 0.
 #
 LOG=`pwd`/test-log
-TARGET=`./select-data`
+TARGET=`$srcdir/select-data`
 
 if test ! -d idx3; then
     mkdir idx3
Index: namazu-2.0.7/tests/mknmz-4
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-4,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-4
--- namazu-2.0.7/tests/mknmz-4	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-4	2001/09/07 11:46:04
@@ -3,7 +3,7 @@
 # Test for deleting documents in an index.
 #
 LOG=`pwd`/test-log
-TARGET=`./select-data`
+TARGET=`$srcdir/select-data`
 
 if test ! -d idx4; then
     mkdir idx4
Index: namazu-2.0.7/tests/mknmz-5
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-5,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-5
--- namazu-2.0.7/tests/mknmz-5	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-5	2001/09/07 11:46:13
@@ -3,7 +3,7 @@
 # Test for updating documents in an index.
 #
 LOG=`pwd`/test-log
-TARGET=`./select-data`
+TARGET=`$srcdir/select-data`
 TMPDATA=`pwd`/tmp-data
 
 if test ! -d idx7; then
Index: namazu-2.0.7/tests/mknmz-8
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-8,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-8
--- namazu-2.0.7/tests/mknmz-8	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-8	2001/09/07 12:22:45
@@ -3,7 +3,7 @@
 # Test for mknmz's --html-split option with updating.
 #
 LOG=`pwd`/test-log
-TARGET=`pwd`/data/html-split
+TARGET=$srcdir/data/html-split
 
 if test ! -d idx10; then
     mkdir idx10
Index: namazu-2.0.7/tests/mknmz-9
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/mknmz-9,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 mknmz-9
--- namazu-2.0.7/tests/mknmz-9	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/mknmz-9	2001/09/07 11:46:47
@@ -4,7 +4,7 @@
 #
 
 LOG=`pwd`/test-log
-TARGET=`./select-data`
+TARGET=`$srcdir/select-data`
 
 if test ! -d idx11; then
     mkdir idx11
Index: namazu-2.0.7/tests/namazu-6
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/namazu-6,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 namazu-6
--- namazu-2.0.7/tests/namazu-6	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/namazu-6	2001/09/07 12:39:57
@@ -19,7 +19,7 @@
 M123="$TMP.123"    # 1.txt and 2.txt 3.txt
 
 cat /dev/null > $M0
-head -1 $IDX/NMZ.r > $M1
+head -1  $IDX/NMZ.r > $M1
 head -2  $IDX/NMZ.r | tail -1 > $M2
 head -3  $IDX/NMZ.r | tail -1 > $M3
 
Index: namazu-2.0.7/tests/select-data
===================================================================
RCS file: /automount/nazuha/cvs/namazu-stable/tests/select-data,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 select-data
--- namazu-2.0.7/tests/select-data	2001/09/07 07:59:12	1.1.1.1
+++ namazu-2.0.7/tests/select-data	2001/09/07 09:42:44
@@ -4,6 +4,7 @@
 #
 
 base=`pwd`/data
+base=$srcdir/data
 
 for lang in "$LC_ALL" "$LC_CTYPE" "$LANG"; do
     cand=`echo "$lang" | perl -nle 'print $1 if /^(..)/'`