Namazu-devel-ja(旧)

[Kazuhiko <kazuhiko@xxxxxxxxxxxxxxxxxxx>]

かずひこです。

At Tue, 7 Aug 2001 13:05:42 +0900,
Kenji Suzuki wrote:

> ファイルの time stamp は、メールヘッダの Date: とは違って
> いますよね?
> 
> 一致させるツールが Namazu にはついていますが。

どれのことかなぁと探していると、たまたま adnmz, lnnmz で @PERLLIBDIR@ が
置換されていないことに気づきました (2.0.6 では undocumented のままかな)。

というわけで、パッチをつけておきます。

# めでたく採用されたら兄弟採用だなぁ。 :)

diff -ur namazu-2.0.6rc6.orig/ChangeLog namazu-2.0.6rc6/ChangeLog
--- namazu-2.0.6rc6.orig/ChangeLog	Mon Aug  6 17:06:43 2001
+++ namazu-2.0.6rc6/ChangeLog	Tue Aug  7 14:08:11 2001
@@ -1,3 +1,12 @@
+2001-08-07  Kazuhiko  <kazuhiko@xxxxxxxxxx>
+
+	* scripts/{adnmz,lnnmz}.in: Use %PERL% instead of @PERL@.
+
+	* scripts/Makefile.am (adnmz): Substitute @PERLLIBDIR@ and %PERL%.
+	(lnnmz): Ditto.
+
+	* configure.in (ac_cv_path_MKNMZ): Remove scripts/{lnnmz|adnmz}.
+
 2001-08-06  NOKUBI Takatsugu  <knok@xxxxxxxxxxxxx>
 
 	* configure.in (AM_INIT_AUTOMAKE): Bumped version number
diff -ur namazu-2.0.6rc6.orig/configure.in namazu-2.0.6rc6/configure.in
--- namazu-2.0.6rc6.orig/configure.in	Mon Aug  6 17:06:43 2001
+++ namazu-2.0.6rc6/configure.in	Tue Aug  7 13:52:11 2001
@@ -413,8 +413,6 @@
 	   scripts/nmzgrep
 	   scripts/rfnmz
 	   scripts/vfnmz
-	   scripts/lnnmz
-	   scripts/adnmz
 	   src/Makefile
 	   template/Makefile
 	   tests/Makefile
@@ -435,8 +433,6 @@
 		    scripts/nmzgrep \
 		    scripts/rfnmz \
 		    scripts/vfnmz \
-		    scripts/lnnmz \
-		    scripts/adnmz \
 	    ]) 
 
 # Local Variables:
diff -ur namazu-2.0.6rc6.orig/scripts/Makefile.am namazu-2.0.6rc6/scripts/Makefile.am
--- namazu-2.0.6rc6.orig/scripts/Makefile.am	Mon Jun 25 00:05:14 2001
+++ namazu-2.0.6rc6/scripts/Makefile.am	Tue Aug  7 14:04:15 2001
@@ -13,8 +13,8 @@
 bin_SCRIPTS    = bnamazu gcnmz kwnmz mailutime mknmz nmzgrep rfnmz vfnmz lnnmz adnmz nmzmerge
 noinst_SCRIPTS = gtnmz
 
-EXTRA_DIST = gcnmz.in kwnmz.in mknmz.in nmzmerge.in
-CLEANFILES  = gcnmz mknmz kwnmz nmzmerge
+EXTRA_DIST = gcnmz.in kwnmz.in mknmz.in nmzmerge.in adnmz.in lnnmz.in
+CLEANFILES  = gcnmz mknmz kwnmz nmzmerge adnmz lnnmz
 
 localedir   = $(prefix)/$(DATADIRNAME)/locale
 confdir     = $(sysconfdir)/$(PACKAGE)
@@ -54,6 +54,20 @@
 	    -e 's!@TEMPLATEDIR@!$(templatedir)!g' $(srcdir)/mknmz.in >mknmz.tmp 
 	mv mknmz.tmp mknmz
 	chmod +x mknmz
+
+adnmz: adnmz.in Makefile
+	rm -f adnmz
+	sed -e 's!%PERL%!$(PERL)!g' \
+	    -e 's!@PERLLIBDIR@!$(perllibdir)!g' $(srcdir)/adnmz.in > adnmz.tmp
+	mv adnmz.tmp adnmz
+	chmod +x adnmz
+
+lnnmz: lnnmz.in Makefile
+	rm -f lnnmz
+	sed -e 's!%PERL%!$(PERL)!g' \
+	    -e 's!@PERLLIBDIR@!$(perllibdir)!g' $(srcdir)/lnnmz.in > lnnmz.tmp
+	mv lnnmz.tmp lnnmz
+	chmod +x lnnmz
 
 ETAGS_ARGS = $(SCRIPTS) --lang=perl
 TAGS_DEPENDENCIES = $(SCRIPTS)
diff -ur namazu-2.0.6rc6.orig/scripts/adnmz.in namazu-2.0.6rc6/scripts/adnmz.in
--- namazu-2.0.6rc6.orig/scripts/adnmz.in	Mon Feb 26 17:47:14 2001
+++ namazu-2.0.6rc6/scripts/adnmz.in	Tue Aug  7 14:06:28 2001
@@ -1,4 +1,4 @@
-#! @PERL@
+#! %PERL%
 # -*- Perl -*-
 # adnmz.pl - make NMZ.field.adjacency
 # $Id: adnmz.in,v 1.1 2001/02/26 08:47:14 baba Exp $
Only in namazu-2.0.6rc6/scripts: lnnmz
diff -ur namazu-2.0.6rc6.orig/scripts/lnnmz.in namazu-2.0.6rc6/scripts/lnnmz.in
--- namazu-2.0.6rc6.orig/scripts/lnnmz.in	Mon Feb 26 17:47:14 2001
+++ namazu-2.0.6rc6/scripts/lnnmz.in	Tue Aug  7 14:06:37 2001
@@ -1,4 +1,4 @@
-#! @PERL@
+#! %PERL%
 # -*- Perl -*-
 # lnnmz - program to make NMZ.field.link
 # $Id: lnnmz.in,v 1.1 2001/02/26 08:47:14 baba Exp $