Release docs/kernel-docs-2.6/filesystems/ext4.txt [JF:20086]

[linuxjf/JF.git] / Makefile

diff --git a/Makefile b/Makefile
index fc0d6d0..4315e35 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
@@ -75,22 +70,22 @@ $(WORKDIR)/txt/JFdocs/INDEX-JF.txt: $(JFINDEXDB)
 
 $(WORKDIR)/html/JFdocs/INDEX-JF.html: $(JFINDEXDB)
        @echo -n "JF: Creating $@..."
-       @(cd $(@D); $(MKNEWINDEX) -t HTML | nkf -j > $@ )
+       @(cd $(@D); $(MKNEWINDEX) -t HTML | nkf -w > $@ )
        @echo "done."
 
 $(WORKDIR)/sgml/JFdocs/INDEX-JF.txt: $(JFINDEXDB)
        @echo -n "JF: Creating $@..."
-       @(cd $(@D); $(MKNEWINDEX) -t TEXT | nkf -j > $@ )
+       @(cd $(@D); $(MKNEWINDEX) -t TEXT | nkf -w > $@ )
        @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 > $@ )
+       @(cd $(@D); $(MKCONTRIBINDEX) -t HTML | nkf -w > $@ )
        @echo "done."
 
 $(WORKDIR)/txt/JFtxt.tar.gz: $(JFINDEXDB)
@@ -127,27 +122,27 @@ $(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 > $@ )
+       @(cd $(@D); $(MKNEWINDEX) -t HTML -w | nkf -w > $@ )
        @echo "done."
        @(cd $(@D); \
        for C in $(CATEGORIES); do \
          echo -n "JF: Creating $(@D)/INDEX-$${C}.html..."; \
-         $(MKNEWINDEX) -t HTML -c $${C} -w | nkf -j > INDEX-$${C}.html;\
+         $(MKNEWINDEX) -t HTML -c $${C} -w | nkf -w > INDEX-$${C}.html;\
          echo "done."; \
        done)
        @(cd $(@D); \
        for K in $(KINDS); do \
          echo -n "JF: Creating $(@D)/INDEX-$${K}.html..."; \
-         $(MKNEWINDEX) -t HTML -k $${K} -w | nkf -j > INDEX-$${K}.html;\
+         $(MKNEWINDEX) -t HTML -k $${K} -w | nkf -w > INDEX-$${K}.html;\
          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 > $@;\
+           $(MKCONTRIBINDEX) -t HTML -w | nkf -w > $@;\
            echo "done.")
 
 $(WWW_ROOT)/JFdocs/JFtxt.tar.gz: $(WORKDIR)/txt/JFtxt.tar.gz
@@ -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)