make copyrightの動作を整理

diff --git a/INSTALL b/INSTALL
index 7b5a97238da4b87c16f6dad2db089b89ffc7216e..c8260038367e5a97e7abcab8eda8339990e65b5e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -13,6 +13,7 @@
   シェルの確認
   2.8.1 'PATH'の設定
   2.8.2 'INFOPATH'の設定
+
 1 要件
 ******
 

diff --git a/Makefile b/Makefile
index 0055a6caca95a4ef6c08898200d194fe5ce3d056..61d7d3cb39896628fe6408fe7903abb0231ec6c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed
-SEDI := $(SED) -i
 WC := wc
 WHICH := which
 XARGS := xargs
@@ -38,7 +37,7 @@ VERSIONFILES := include/version.h \
 
 CMDFILES := casl2 comet2 dumpword casl2rev comet2monitor
 
-YEAR := $(shell $(DATE) '+%Y')
+YEAR = $(shell $(DATE) '+%Y')
 
 all: copyright INSTALL build gtags
 
@@ -93,8 +92,7 @@ gittag:
        if test `$(GIT) status -s | $(WC) -l` -gt 0; then $(ECHO) "Error: commit, first."; exit 1; fi; if test "$(VERSIONGITREF)" != "$(MAINGITREF)"; then $(GIT) tag $(VERSION); fi
 
 copyright:
-       $(SEDI) 's/Copyright (c) 2010-20[0-9][0-9]/Copyright (c) 2010-$(YEAR)/g' LICENSE README
-       $(SEDI) 's/Copyright @copyright{} 2010-20[0-9][0-9]/Copyright @copyright{} 2010-$(YEAR)/g' doc/*.texi
+       $(SED) -i.bak 's/Copyright (c) 2010-20[0-9][0-9]/Copyright (c) 2010-$(YEAR)/g' LICENSE README && $(RM) *.bak
 
 distclean: cmd-clean src-distclean gtags-clean version-clean clean
 

diff --git a/VERSION b/VERSION
index 144c974c06777ec8671de160cc83d3061f4f7d2d..cb095d000a2d50491d5c59be72354f086794f5c0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.5p36
+v0.5p37

diff --git a/doc/Makefile b/doc/Makefile
index 53df4cf5dc4b98d86fc3ac0e7bb4151974c31354..95e3947eefe1538bd0155d9eee456ae7f90b33dc 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
-RMR := $(RM) -r
 SED := sed
+DATE := date
 
 DOCS := install manual
 CSS := style.css
@@ -11,12 +11,17 @@ TEXITARGETS := install.html manual.html
 
 INSTALL-INFO-TARGETS := yacasl2.info
 
+YEAR := $(shell $(DATE) '+%Y')
+
 .PHONY: base all info html htmls pdf casl2_spec distclean clean
 
-base: install.txt info html
+base: copyright install.txt info html
 
 all: base htmls pdf casl2_spec
 
+copyright:
+       $(SED) -i.sed_bak 's/Copyright @copyright{} 2010-20[0-9][0-9]/Copyright @copyright{} 2010-$(YEAR)/g' *.texi && $(RM) *.sed_bak
+
 info: yacasl2.info
 
 html: $(addsuffix .html,$(DOCS))
@@ -37,12 +42,12 @@ yacasl2.info: manual.texi
 
 # makeで作成されたドキュメントはすべて削除
 distclean: clean texinfo-distclean
-       $(RM) install.txt *.info *.html *_html *.pdf
+       $(RM) install.txt *.info *.html *_html *.pdf *.sed_bak
        $(MAKE) -C casl2_spec distclean
 
 # make baseで作成されたドキュメントは残す
 clean: texinfo-clean
-       $(RM) *.bak
+       $(RM) *.sed_bak
        $(MAKE) -C casl2_spec clean
 
 include texinfo.mk