[w3m-dev 03996] HELP_DIR and funcname.tab

* configure.in (HELP_DIR): don't eval
* scripts/w3mhelp.cgi: subst @prefix@ for $helpdir
From: SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>

4 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e31916..fa3da42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-21  SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
+
+	* [w3m-dev 03996] HELP_DIR and funcname.tab
+	* configure.in (HELP_DIR): don't eval 
+	* scripts/w3mhelp.cgi: subst @prefix@ for $helpdir
+
 2003-10-21  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* #include <openssl/...>
@@ -8225,4 +8231,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.886 2003/10/20 16:41:56 ukai Exp $
+$Id: ChangeLog,v 1.887 2003/10/20 16:49:10 ukai Exp $
diff --git a/configure b/configure
index 26bce3e..302b3c4 100755
--- a/configure
+++ b/configure
@@ -9255,7 +9255,7 @@ _ACEOF
  fi
 
 
-HELP_DIR=`eval echo "$datadir/$PACKAGE"`
+HELP_DIR="$datadir/$PACKAGE"
 cat >>confdefs.h <<\_ACEOF
 #define HELP_DIR "$HELP_DIR"
 _ACEOF
diff --git a/configure.in b/configure.in
index 79751e5..49362d0 100644
--- a/configure.in
+++ b/configure.in
@@ -150,7 +150,7 @@ AC_W3M_SIGSETJMP
 AC_W3M_SIGNAL
 
 AC_SUBST(HELP_DIR)
-HELP_DIR=`eval echo "$datadir/$PACKAGE"`
+HELP_DIR="$datadir/$PACKAGE"
 AC_DEFINE(HELP_DIR, "$HELP_DIR")
 AC_SUBST(RC_DIR)
 RC_DIR="~/.$PACKAGE"
diff --git a/scripts/w3mhelp.cgi.in b/scripts/w3mhelp.cgi.in
index f0f14f4..92af2d3 100644
--- a/scripts/w3mhelp.cgi.in
+++ b/scripts/w3mhelp.cgi.in
@@ -1,10 +1,11 @@
 #!@PERL@
-# $Id: w3mhelp.cgi.in,v 1.26 2003/09/22 21:02:29 ukai Exp $
+# $Id: w3mhelp.cgi.in,v 1.27 2003/10/20 16:49:11 ukai Exp $
 
 if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) {
   $CYGPATH = 1;
 }
 
+$prefix = "@prefix@";
 $helpdir = "@HELP_DIR@";
 if ($CYGPATH) {
   $helpdir = &cygwin_pathconv($helpdir);