[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>
This commit is contained in:
Fumitoshi UKAI
2003-10-20 16:49:10 +00:00
parent 8dc1127617
commit 6917379868
4 changed files with 11 additions and 4 deletions

View File

@@ -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> 2003-10-21 Fumitoshi UKAI <ukai@debian.or.jp>
* #include <openssl/...> * #include <openssl/...>
@@ -8225,4 +8231,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-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 $

2
configure vendored
View File

@@ -9255,7 +9255,7 @@ _ACEOF
fi fi
HELP_DIR=`eval echo "$datadir/$PACKAGE"` HELP_DIR="$datadir/$PACKAGE"
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HELP_DIR "$HELP_DIR" #define HELP_DIR "$HELP_DIR"
_ACEOF _ACEOF

View File

@@ -150,7 +150,7 @@ AC_W3M_SIGSETJMP
AC_W3M_SIGNAL AC_W3M_SIGNAL
AC_SUBST(HELP_DIR) AC_SUBST(HELP_DIR)
HELP_DIR=`eval echo "$datadir/$PACKAGE"` HELP_DIR="$datadir/$PACKAGE"
AC_DEFINE(HELP_DIR, "$HELP_DIR") AC_DEFINE(HELP_DIR, "$HELP_DIR")
AC_SUBST(RC_DIR) AC_SUBST(RC_DIR)
RC_DIR="~/.$PACKAGE" RC_DIR="~/.$PACKAGE"

View File

@@ -1,10 +1,11 @@
#!@PERL@ #!@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 ) { if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) {
$CYGPATH = 1; $CYGPATH = 1;
} }
$prefix = "@prefix@";
$helpdir = "@HELP_DIR@"; $helpdir = "@HELP_DIR@";
if ($CYGPATH) { if ($CYGPATH) {
$helpdir = &cygwin_pathconv($helpdir); $helpdir = &cygwin_pathconv($helpdir);