www: Update download.m4

[linuxjm/jm.git] / www / Makefile

diff --git a/www/Makefile b/www/Makefile
index f024354..1c5e302 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -14,28 +14,26 @@ endif
 .SUFFIXES: .m4 .html
 
 .m4.html:
-       m4 -P -D _WORKDIR=$(WORKDIR) $*.m4 | cat -s | nkf -j > $*.html
+       m4 -P -D _WORKDIR=$(WORKDIR) $*.m4 | cat -s | nkf -w > $*.html
 
 CONTENTS = index.html download.html section.html copyright.html \
        README.html INSTALL.html \
-       missing.html nosuchpage.html manerror.html mail_error.html \
-       news.html news2001.html news2000.html news1999.html \
-       news2002.html news2003.html news2004.html news2005.html news2006.html
+       missing.html nosuchpage.html manerror.html
 #
 # rules
 #
 all: contents
        make -C INDEX/
-       make -C guidance/ WWWROOT=$(WWWROOT)
        make -C man-ja/
        make -C rpm/ DATE=$(DATE)
        make -C announcement/
+       make -C news/
 
 contents: $(CONTENTS)
 
 *.html: jm_www.m4
 
-index.html: news.m4 ../stamp/latest-archive-modified
+index.html: news/index.m4 ../stamp/latest-archive-modified
 
 README.html: ../dist/README
 
@@ -45,7 +43,7 @@ INSTALL.html: ../dist/INSTALL
        $(MAKE) -C .. -f Makefile.dist
 
 download.html: download.m4 ../stamp/latest-archive-modified
-       m4 -P -D _WORKDIR=$(WORKDIR) -D _DATE=$(DATE) $< | nkf -j > $@
+       m4 -P -D _WORKDIR=$(WORKDIR) -D _DATE=$(DATE) $< | nkf -w > $@
 
 ../stamp/latest-archive-modified:
        make -C .. stamp/latest-archive-modified
@@ -55,18 +53,17 @@ clean:
        -$(RM) -rf per-pkg/
        -$(RM) -f rpm/*.rpm rpm/index.html
        make -C INDEX/ clean
-       make -C guidance/ clean
        make -C man-ja/ clean
        make -C announcement/ clean
 
 install: all
-       $(MAKE) -C guidance  WWWROOT=$(WWWROOT) install
-       $(RSYNC) -a -v \
+       $(RSYNC) -a --delete -v \
        --exclude='bin' \
        --exclude='*.m4' \
        --exclude='*.perl' \
        --exclude='*.list' \
        --exclude='Makefile' \
        --exclude='ChangeLog' \
-       * $(WWWROOT)
+       --exclude='.gitignore' \
+       * .htaccess $(WWWROOT)
        $(MAKE) -C ../admin/site WWWROOT=$(WWWROOT) install