w3m

commit 264f98f32b387bcae20c6215ca925b172bf1718a
parent 191bc8447a612463da8decbbd7abb97da1cd9a41
Author: ukai <ukai>
Date:   Mon, 20 Oct 2003 16:49:10 +0000

[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>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
configure
 | 
2
+-
M
configure.in
 | 
2
+-
M
scripts/w3mhelp.cgi.in
 | 
1
+

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git 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/...>
diff --git 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
@@ -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
@@ -5,6 +5,7 @@ if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) {
   $CYGPATH = 1;
 }
 
+$prefix = "@prefix@";
 $helpdir = "@HELP_DIR@";
 if ($CYGPATH) {
   $helpdir = &cygwin_pathconv($helpdir);