convert the encoding of jp.netatalk-HOWTO to UTF-8

[linuxjf/JF.git] / Makefile

diff --git a/Makefile b/Makefile
index 2faedd5..4315e35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,8 @@ export PROJROOT
 
 all:
        cd docs ; make
-#      if [ -d $(FTP_ROOT)/JFdocs ]; then \
-#              rm -rf $(FTP_ROOT)/JFdocs; \
-#      fi
 
-generate_database: $(JFINDEXDB) $(CONTRIBDB)
+generate_database: $(JFINDEXDB)
 
 install-docs:
        cd docs ; make install
@@ -19,31 +16,13 @@ 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 WORKDIR=$(WORKDIR)
-       mkdir -p $(WWW_ROOT)
-       (cd www; tar cf - --exclude=CVS --exclude=Makefile --exclude=bin \
-        --exclude="*.\#?*" --exclude=.cvsignore \
-        --exclude="ChangeLog" --exclude="_?*" --exclude="*.m4" ./) \
-        | ( cd $(WWW_ROOT); tar xpf -)
+       cd www; make install
 
 greenroom_contents:
        cd admin/Greenroom ; make install
 
-# ldp-jp_contents:
-#      rm -rf $(WWW_ROOT)/LDP
-#      mkdir -p $(WWW_ROOT)/LDP
-#      (cd LDP; tar cf - --exclude=CVS --exclude=Makefile --exclude=bin \
-#       --exclude="*.\#?*" --exclude=.cvsignore \
-#       --exclude="ChangeLog" --exclude="_?*" --exclude="*.m4" ./) \
-#       | ( cd $(WWW_ROOT)/LDP; tar xpf -)
-
 install-www:   www_contents greenroom_contents \
                $(WWW_ROOT)/JFdocs/INDEX-JF.html \
                $(WWW_ROOT)/JFdocs/JFtxt.tar.gz \
@@ -91,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)
@@ -143,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
@@ -202,22 +181,14 @@ $(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)
-#      @find $(PROJROOT)/docs -name "info" -maxdepth 3 -print | xargs $(GEN_INDEX)
        @echo "done."
 
-#$(CONTRIBDB): $(LAST_MODIFIED)
-#      @echo -n "JF: Generating index database of contributed documents..."
-#      @rm -f $(CONTRIBDB)
-#      @find $(PROJROOT)/docs -name "info" -maxdepth 7 -mindepth 4 -print | xargs $(GEN_CONTRIB)
-#      @echo "done."
-
 clean:
-       (cd docs ; make clean)
-       (cd www ; make clean)
-       (cd admin/Greenroom ; make clean)
-       # rm -rf $(WORKDIR)
+       cd docs ; make clean
+       cd www ; make clean
+       cd admin/Greenroom ; make clean
        rm -f $(LAST_MODIFIED)