X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Makefile;h=593660c2b1f46c8abe84ccf2959d593357469eb5;hb=f970d451222a08247d43c1b8fb70e48f4dd793bf;hp=0453622e168beec1fc55e9697b1384f630208e7f;hpb=ff3a14b887660bb363d0b1cb7eeb093619f99d70;p=linuxjm%2Fjm.git

diff --git a/Makefile b/Makefile
index 0453622e..593660c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
 #
-# $Id: Makefile,v 1.37 2007/11/19 05:29:25 nakano Exp $
-#
 # Build macro for JM project.  If something don't work well,
 # please refer the description in admin/JM-CVS/JM-CVS.sgml.
 #
@@ -17,9 +15,10 @@ CHKCVS=bin/chkcvs.sh
 
 ROFFSRC=./manual
 PODSRC=./pod
+INFOSRC=./info
 
 JMVER=0.5
-JMRELEASE := $(shell date +"%Y%m%d")
+JMRELEASE := $(shell env LANG=C date +"%Y%m%d")
 DIST := man-pages-ja-$(JMRELEASE)
 
 JMRPMDIST := jman_pages-$(JMVER)-$(JMRELEASE)
@@ -30,7 +29,7 @@ JMRPM_BUILD_ROOT=$(TMPDIR)/man-pages-ja-root
 #
 # global rules
 #
-periodic: chkcvs roff html web cgi
+periodic: chkcvs roff infoman html web cgi guide web-extra
 
 all: periodic archive-install 
 
@@ -49,9 +48,9 @@ roff: stamp/www-roff-modified
 
 stamp/www-roff-modified: stamp/cvs-status-modified
 	@mkdir -p $(WWWROFF)
-	$(RSYNC) -a $(ROFFSRC)/ $(WWWROFF)
+	$(RSYNC) -a --delete --omit-dir-times -v $(ROFFSRC)/ $(WWWROFF)
 	@mkdir -p $(WWWPOD)
-	$(RSYNC) -a $(PODSRC)/ $(WWWPOD)
+	$(RSYNC) -a --delete --omit-dir-times -v $(PODSRC)/ $(WWWPOD)
 	touch $@
 
 #
@@ -64,11 +63,21 @@ stamp/www-html-modified: stamp/cvs-release-modified
 	mkdir -p $(WWWHTML)
 	$(MKRWWW) $(ROFFSRC) $(WWWHTML) $(MAN2HTML)
 	$(MKPWWW) $(PODSRC) $(WWWHTML) $(POD2HTML)
+#	$(MAKE) -C $(INFOSRC) install
 	# Remove temporary files generated by pod2html
 	rm -f pod2htmd.tmp pod2htmi.tmp
 	touch $@
 
 #
+# info tree
+#
+infoman: stamp/www-info-modified
+
+stamp/www-info-modified: stamp/info-release-modified
+	$(MAKE) -C $(INFOSRC) install
+	touch $@
+
+#
 # web & cgi contents
 #
 web:
@@ -81,6 +90,14 @@ cgi:
 		WWWROOT=$(WWWROOT) CGIROOT=$(CGIROOT)\
 		install
 
+.PHONY:	guide
+guide:
+	$(MAKE) -C guide/ -f Makefile.venv-wrap install WWWROOT=$(WWWROOT) install
+
+.PHONY:	web-extra
+web-extra:
+	rsync -av manual/LDP_man-pages/untrans.html $(WWWROOT)/LDP_untrans.html
+
 #
 # archive related rules
 #
@@ -121,6 +138,8 @@ $(TMPDIR)/$(DIST).tar.gz:
 rpm: $(RPMROOT)/RPMS/noarch/$(JMRPMDIST).noarch.rpm
 
 $(RPMROOT)/RPMS/noarch/$(JMRPMDIST).noarch.rpm: $(JMRPMSRC)
+ifdef NORPM
+else
 	mkdir -p $(RPMROOT)/SOURCES
 	mkdir -p $(RPMROOT)/SPECS
 	mkdir -p $(RPMROOT)/BUILD
@@ -138,19 +157,23 @@ $(RPMROOT)/RPMS/noarch/$(JMRPMDIST).noarch.rpm: $(JMRPMSRC)
 	    --dbpath $(RPMROOT)/db \
 	    --define "_topdir $(RPMROOT)"  \
 	    --define "_tmppath $(RPMROOT)/tmp"  \
+	    --define "_sourcedir $(RPMROOT)/SOURCES" \
 	    --define "_mandir /usr/share/man" -ba \
 	    $(RPMROOT)/SPECS/$(JMRPMSPEC)
 	touch stamp/latest-archive-modified
+endif
 
 #
 # clean
 #
-clean:
+clean:	tmpclean
 	rm -f stamp/*-modified
-	rm -rf $(TMPDIR)
 	$(MAKE) -C admin/cgi/ clean
 	$(MAKE) -C www/ clean
 	$(MAKE) -f Makefile.dist clean
+
+tmpclean:
+	rm -rf $(TMPDIR)
 	rm -rf $(JMRPM_BUILD_ROOT)
 	rm -rf $(RPMROOT)/BUILD/$(DIST)
 	for i in $(JMRPMSRC); do \