remove CONTRIBDB macro

diff --git a/JF.conf b/JF.conf
index 853da78..ab3827e 100644 (file)
--- a/JF.conf
+++ b/JF.conf
@@ -25,7 +25,6 @@ NMZ_ROOT        =$(DESTROOT)/namazu
 # jfindex.db
 #
 JFINDEXDB       =$(PROJROOT)/jfindex.db
-CONTRIBDB       =$(JFINDEXDB)
 
 #
 # INDEX categories.
@@ -148,9 +147,8 @@ XMLDCL           = $(PROJROOT)/xml.dcl
 INSTALL          = install -m 644
 
 GEN_INDEX        = $(BINDIR)/genindex.pl $(JFINDEXDB)
-GEN_CONTRIB      = $(BINDIR)/genindex.pl $(CONTRIBDB)
 MKNEWINDEX       = perl -I $(BINDIR) $(BINDIR)/mknewidx.pl      -d $(JFINDEXDB)
-MKCONTRIBINDEX   = perl -I $(BINDIR) $(BINDIR)/mkcontriblist.pl -d $(CONTRIBDB)
+MKCONTRIBINDEX   = perl -I $(BINDIR) $(BINDIR)/mkcontriblist.pl -d $(JFINDEXDB)
 PERL_CRLF        = perl -e 'while (<>) {chop; print; print "\r\n";}'
 
 NKF              = nkf

diff --git a/Makefile b/Makefile
index fc0d6d0..705388b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,6 @@ install-index:       $(JFINDEXDB) \
                $(WORKDIR)/html/JFdocs/INDEX-JF.html \
                $(WORKDIR)/sgml/JFdocs/INDEX-JF.txt
 
-install-contrib-index: $(CONTRIBDB) \
-               $(WORKDIR)/contrib/INDEX.txt \
-               $(WORKDIR)/contrib/index.html \
-               $(WORKDIR)/contrib/INDEX.txt
-
 ifeq ($(INSTALL_WWW), yes)
 www_contents:
        cd www; make install
@@ -83,12 +78,12 @@ $(WORKDIR)/sgml/JFdocs/INDEX-JF.txt: $(JFINDEXDB)
        @(cd $(@D); $(MKNEWINDEX) -t TEXT | nkf -j > $@ )
        @echo "done."
 
-$(WORKDIR)/contrib/INDEX.txt: $(CONTRIBDB)
+$(WORKDIR)/contrib/INDEX.txt: $(JFINDEXDB)
        @echo -n "JF: Creating $@..."
        @(cd $(@D); $(MKCONTRIBINDEX) -t TEXT | nkf -s | $(PERL_CRLF) > $@ )
        @echo "done."
 
-$(WORKDIR)/contrib/index.html: $(CONTRIBDB)
+$(WORKDIR)/contrib/index.html: $(JFINDEXDB)
        @echo -n "JF: Creating $@..."
        @(cd $(@D); $(MKCONTRIBINDEX) -t HTML | nkf -j > $@ )
        @echo "done."
@@ -127,7 +122,7 @@ $(WORKDIR)/sgml/JFsgml.tar.bz2: $(JFINDEXDB)
 # Building and installing Web/FTP contents.
 #
 
-$(WWW_ROOT)/JFdocs/INDEX-JF.html: $(JFINDEXDB) $(SUMMARIZING_SCRIPT)
+$(WWW_ROOT)/JFdocs/INDEX-JF.html: $(JFINDEXDB)
        @echo -n "JF: Creating $@..."
        @(cd $(@D); $(MKNEWINDEX) -t HTML -w | nkf -j > $@ )
        @echo "done."
@@ -144,7 +139,7 @@ $(WWW_ROOT)/JFdocs/INDEX-JF.html: $(JFINDEXDB) $(SUMMARIZING_SCRIPT)
          echo "done."; \
        done)
 
-$(WWW_ROOT)/contrib/index.html: $(CONTRIBDB) $(CONTRIB_SCRIPT)
+$(WWW_ROOT)/contrib/index.html: $(JFINDEXDB)
        @(cd $(@D); \
            echo -n "JF: Creating $@..."; \
            $(MKCONTRIBINDEX) -t HTML -w | nkf -j > $@;\
@@ -186,7 +181,7 @@ $(FTP_ROOT)/JFhtml.tar.bz2: $(WORKDIR)/html/JFhtml.tar.bz2
 $(FTP_ROOT)/JFsgml.tar.bz2: $(WORKDIR)/sgml/JFsgml.tar.bz2
        @(echo -n "JF: Installing $@..."; $(INSTALL) $< $@; echo "done.")
 
-$(JFINDEXDB): $(INDEXING_SCRIPT) $(SUMMARIZING_SCRIPT) $(LAST_MODIFIED) $(OBSOLETE)
+$(JFINDEXDB): $(LAST_MODIFIED) $(OBSOLETE)
        @echo -n "JF: Generating index database..."
        @rm -f $(JFINDEXDB)
        @find $(PROJROOT)/docs -name "info" | xargs $(GEN_INDEX)