namazu-ml(ring)
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: namazu-1.3.1.0-pre-3 (Re: namazu-1.3.1.0-pre-2)
馬場＠京大宇宙物理 です。
Date: Satoru Takabayashi <ccsatoru@xxxxxxxxxxxxxxxxxx>
From: [namazu 27] namazu-1.3.1.0-pre-3 (Re: namazu-1.3.1.0-pre-2)
Subject: Wed, 03 Feb 1999 18:00:12 JST
> ありがとうございます。なんとかマージして pre-3 を作りました。
ご苦労様でした。本体の改造に加えてややこしいことをお願いしたわりに
いい加減なコメントだけで済みませんでした。
> に置いてあります。動作確認をお願いします。
いくつか、configure まわりと automake まわりでインストールパスの
設定などにバグ入り/冗長な設定があったので、パッチをつけておきます。
> 確かに便利ですね。 autoconf, automake は覚えるのは面倒でも得るもの
> が大きいようです。きちんと勉強します。
＃ んー、ゆっくりでも構わないですよ。
--
馬場 肇 ( Hajime BABA ) E-mail: baba@xxxxxxxxxxxxxxxxxxxxxx
京都大学理学部宇宙物理学教室 博士課程二回生
--
diff -ru namazu-1.3.1.0-pre-3.orig/Makefile.am namazu-1.3.1.0-pre-3.work/Makefile.am
--- namazu-1.3.1.0-pre-3.orig/Makefile.am Wed Feb 3 16:58:27 1999
+++ namazu-1.3.1.0-pre-3.work/Makefile.am Wed Feb 3 23:21:00 1999
@@ -7,7 +7,6 @@
pkgdatadir = @prefix@/@PACKAGE@
install-data-local:
- $(mkinstalldirs) $(pkgdatadir)
$(mkinstalldirs) $(pkgdatadir)/index
@for subdir in $(EXTRA_DIRS); do \
echo cp -rp $$subdir $(pkgdatadir)/$$subdir; \
diff -ru namazu-1.3.1.0-pre-3.orig/Makefile.in namazu-1.3.1.0-pre-3.work/Makefile.in
--- namazu-1.3.1.0-pre-3.orig/Makefile.in Wed Feb 3 17:39:06 1999
+++ namazu-1.3.1.0-pre-3.work/Makefile.in Wed Feb 3 23:33:59 1999
@@ -358,7 +358,6 @@
install-data-local:
- $(mkinstalldirs) $(pkgdatadir)
$(mkinstalldirs) $(pkgdatadir)/index
@for subdir in $(EXTRA_DIRS); do \
echo cp -rp $$subdir $(pkgdatadir)/$$subdir; \
diff -ru namazu-1.3.1.0-pre-3.orig/acconfig.h namazu-1.3.1.0-pre-3.work/acconfig.h
--- namazu-1.3.1.0-pre-3.orig/acconfig.h Wed Feb 3 15:57:41 1999
+++ namazu-1.3.1.0-pre-3.work/acconfig.h Wed Feb 3 23:09:26 1999
@@ -1,10 +1,10 @@
-/* */
+/* Define the pathname of default index directory */
#undef INDEXDIR
-/* Pathname of namazu.conf */
+/* Define the pathname of namazu.conf */
#undef OPT_NAMAZU_CONF
-/* Language (ja or en) */
+/* Define the default language (ja or en) */
#undef LANGUAGE
/* Scoring method
@@ -14,5 +14,5 @@
*/
#undef SCORING
-/* */
+/* Define if you want to fix the bug of MSIE4.x for Macintosh :-( */
#undef MSIE4MACFIX
diff -ru namazu-1.3.1.0-pre-3.orig/config.h.in namazu-1.3.1.0-pre-3.work/config.h.in
--- namazu-1.3.1.0-pre-3.orig/config.h.in Wed Feb 3 15:57:41 1999
+++ namazu-1.3.1.0-pre-3.work/config.h.in Wed Feb 3 23:09:48 1999
@@ -37,13 +37,13 @@
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* */
+/* Define the pathname of default index directory */
#undef INDEXDIR
-/* Pathname of namazu.conf */
+/* Define the pathname of namazu.conf */
#undef OPT_NAMAZU_CONF
-/* Language (ja or en) */
+/* Define the default language (ja or en) */
#undef LANGUAGE
/* Scoring method
@@ -53,7 +53,7 @@
*/
#undef SCORING
-/* */
+/* Define if you want to fix the bug of MSIE4.x for Macintosh :-( */
#undef MSIE4MACFIX
/* Define if you have the memmove function. */
diff -ru namazu-1.3.1.0-pre-3.orig/configure namazu-1.3.1.0-pre-3.work/configure
--- namazu-1.3.1.0-pre-3.orig/configure Wed Feb 3 16:13:39 1999
+++ namazu-1.3.1.0-pre-3.work/configure Wed Feb 3 23:34:01 1999
@@ -2159,14 +2159,12 @@
test "${prefix}" = NONE && prefix=/usr/local
-test "${namazu_prefix}" = NONE && namazu_prefix=${prefix}/$PACKAGE
-
cat >> confdefs.h <<EOF
-#define INDEXDIR "${namazu_prefix}/index"
+#define INDEXDIR "${prefix}/${PACKAGE}/index"
EOF
cat >> confdefs.h <<EOF
-#define OPT_NAMAZU_CONF "${namazu_prefix}/lib/namazu.conf"
+#define OPT_NAMAZU_CONF "${prefix}/${PACKAGE}/lib/namazu.conf"
EOF
cat >> confdefs.h <<EOF
@@ -2174,7 +2172,7 @@
EOF
cat >> confdefs.h <<\EOF
-#define SCORING "TFIDF"
+#define SCORING TFIDF
EOF
cat >> confdefs.h <<\EOF
diff -ru namazu-1.3.1.0-pre-3.orig/configure.in namazu-1.3.1.0-pre-3.work/configure.in
--- namazu-1.3.1.0-pre-3.orig/configure.in Wed Feb 3 16:13:05 1999
+++ namazu-1.3.1.0-pre-3.work/configure.in Wed Feb 3 23:33:48 1999
@@ -165,13 +165,10 @@
dnl set default Namazu dir
test "${prefix}" = NONE && prefix=/usr/local
-test "${namazu_prefix}" = NONE && namazu_prefix=${prefix}/$PACKAGE
-dnl AC_SUBST(namazu_prefix)
-
-AC_DEFINE_UNQUOTED(INDEXDIR, "${namazu_prefix}/index")
-AC_DEFINE_UNQUOTED(OPT_NAMAZU_CONF, "${namazu_prefix}/lib/namazu.conf")
+AC_DEFINE_UNQUOTED(INDEXDIR, "${prefix}/${PACKAGE}/index")
+AC_DEFINE_UNQUOTED(OPT_NAMAZU_CONF, "${prefix}/${PACKAGE}/lib/namazu.conf")
AC_DEFINE_UNQUOTED(LANGUAGE, "$LANGUAGE")
-AC_DEFINE(SCORING, "TFIDF")
+AC_DEFINE(SCORING, TFIDF)
AC_DEFINE(MSIE4MACFIX)
dnl *
diff -ru namazu-1.3.1.0-pre-3.orig/lib/conf.pl namazu-1.3.1.0-pre-3.work/lib/conf.pl
--- namazu-1.3.1.0-pre-3.orig/lib/conf.pl Wed Feb 3 17:03:40 1999
+++ namazu-1.3.1.0-pre-3.work/lib/conf.pl Wed Feb 3 23:52:55 1999
@@ -115,13 +115,13 @@
## KAKASI or ChaSen (to handle Japanese characters)
## KAKASI must have -w option added by Hajime BABA-san
-$KAKASI = "module_kakasi -ieuc -oeuc -w";
+$KAKASI = "/usr/local/bin/kakasi -ieuc -oeuc -w";
## ChaSen 1.51 (simple wakatigaki)
-$CHASEN = "module_chasen1 -j -F '\%m '";
+$CHASEN = "not_found -j -F '\%m '";
## ChaSen 1.51 (with morphological processing)
-$CHASEN_MORPH = "module_chasen1 -j -F '\%m %H\\n'";
+$CHASEN_MORPH = "not_found -j -F '\%m %H\\n'";
## Default Japanese processer
$WAKATI = $KAKASI;
diff -ru namazu-1.3.1.0-pre-3.orig/src/Makefile.am namazu-1.3.1.0-pre-3.work/src/Makefile.am
--- namazu-1.3.1.0-pre-3.orig/src/Makefile.am Wed Feb 3 17:02:55 1999
+++ namazu-1.3.1.0-pre-3.work/src/Makefile.am Wed Feb 3 23:50:25 1999
@@ -13,8 +13,7 @@
##################################################################
## Directories
-namazu_prefix = @prefix@/$(PACKAGE)
-LIBDIR = $(namazu_prefix)/lib
+exec_prefix = @prefix@/@PACKAGE@
##################################################################
## Target for Make
@@ -148,7 +147,7 @@
mknmz: conf.pl mknmz.pl
rm -f $@
sed -e 's!%PERL%!$(PERL)!g' \
- -e 's!%OPT_LIBDIR%!$(LIBDIR)!g' \
+ -e 's!%OPT_LIBDIR%!$(libdir)!g' \
mknmz.pl > $@
chmod +x $@
diff -ru namazu-1.3.1.0-pre-3.orig/src/Makefile.in namazu-1.3.1.0-pre-3.work/src/Makefile.in
--- namazu-1.3.1.0-pre-3.orig/src/Makefile.in Wed Feb 3 17:39:08 1999
+++ namazu-1.3.1.0-pre-3.work/src/Makefile.in Wed Feb 3 23:51:55 1999
@@ -17,7 +17,6 @@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
-exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
@@ -74,8 +73,7 @@
##################################################################
-namazu_prefix = @prefix@/$(PACKAGE)
-LIBDIR = $(namazu_prefix)/lib
+exec_prefix = @prefix@/@PACKAGE@
##################################################################
@@ -300,23 +298,6 @@
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-cgi.o: cgi.c namazu.h ../config.h util.h
-codeconv.o: codeconv.c namazu.h ../config.h
-conf.o: conf.c namazu.h ../config.h util.h
-form.o: form.c namazu.h ../config.h util.h
-hlist.o: hlist.c namazu.h ../config.h util.h
-messages.o: messages.c namazu.h ../config.h
-namazu.o: namazu.c namazu.h ../config.h
-output.o: output.c namazu.h ../config.h
-parser.o: parser.c namazu.h ../config.h
-re_match.o: re_match.c regex.h namazu.h ../config.h util.h
-regex.o: regex.c regex.h util.h namazu.h ../config.h
-search.o: search.c namazu.h ../config.h util.h
-seed.o: seed.c
-util.o: util.c namazu.h ../config.h
-values.o: values.c namazu.h ../config.h
-wakati.o: wakati.c namazu.h ../config.h util.h
-
info-am:
info: info-am
dvi-am:
@@ -396,7 +377,7 @@
mknmz: conf.pl mknmz.pl
rm -f $@
sed -e 's!%PERL%!$(PERL)!g' \
- -e 's!%OPT_LIBDIR%!$(LIBDIR)!g' \
+ -e 's!%OPT_LIBDIR%!$(libdir)!g' \
mknmz.pl > $@
chmod +x $@