use Jcode.pm instead of jcode.pl

diff --git a/ChangeLog b/ChangeLog
index 8474ed1..a24f008 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 22 23:44:10 2010  Masanori Kobayasi  <zap03216@nifty.ne.jp>
+
+       * bin/genindex.pl: use Jcode.pm instead of jcode.pl.
+
 Tue Apr  6 00:45:08 2010  Masanori Kobayasi  <zap03216@nifty.ne.jp>
 
        * docs/LFS-BOOK/*: Updated to LFS 6.6.

diff --git a/bin/genindex.pl b/bin/genindex.pl
index 5214a49..3732bbc 100755 (executable)
--- a/bin/genindex.pl
+++ b/bin/genindex.pl
@@ -12,7 +12,8 @@ use vars;
 use DB_File;
 use lib qw(bin);
 use jfadmlib qw(:DEFAULT :LOCKS);
-require 'jcode.pl';
+use Jcode;
+
 my $database = shift (@ARGV);
 
 unlink $database;
@@ -33,7 +34,7 @@ foreach my $file (@ARGV)
        last if /DRAFT.NOINDEX/i;  
        s/\s*#.*$//;
        next if /^\s*$/;
-       &jcode::convert(\$_, 'euc');
+       Jcode::convert(\$_, 'euc');
        if (/^(\w+):\s*(.*)$/) {
            my ($key, $value) = ($1, $2);
            $value =~ s/\s*$//;

diff --git a/www/ChangeLog b/www/ChangeLog
index df60115..1c4eea3 100644 (file)
--- a/www/ChangeLog
+++ b/www/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 22 23:46:32 2010  Masanori Kobayasi  <zap03216@nifty.ne.jp>
+
+       * bin/latest-docs.pl: use Jcode.pm instead of jcode.pl.
+
 Wed Apr 21 00:48:03 2010  Masanori Kobayasi  <zap03216@nifty.ne.jp>
 
        * news.m4: _NEW_DOC kernel-docs-2.6/filesystems/fiemap.txt

diff --git a/www/bin/latest-docs.pl b/www/bin/latest-docs.pl
index 3dccddc..403a99a 100755 (executable)
--- a/www/bin/latest-docs.pl
+++ b/www/bin/latest-docs.pl
@@ -11,7 +11,7 @@ use Time::Local;
 use DB_File;
 use lib ("../bin", "../../bin"); # jfadmlib.pm ¤Î¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê
 use jfadmlib;
-require 'jcode.pl';
+use Jcode;
 
 my $indexfile = '../jfindex.db';
 if ((! -r $indexfile) and (-r $ARGV[3])) {
@@ -95,7 +95,7 @@ sub get_kdoc_cont {
     while (<INFO>) {
        if (/^CONT: (.+)$/) {
            $data = $1;
-           jcode::convert(\$data, 'euc');
+           Jcode::convert(\$data, 'euc');
            last;
        }
     }