X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=Makefile;h=67d7de3e47a7345ff8b2ce1f27d4655376ffdef3;hp=17301248e561b843a61b30fdec5576626b548a1d;hb=b8b0bb2a7b5ef20cdbee5f555c5846dfc1c7f981;hpb=6c6960b1dcf3116da04f39233d889b6ee04384c0

diff --git a/Makefile b/Makefile
index 1730124..67d7de3 100644
--- a/Makefile
+++ b/Makefile
@@ -6,25 +6,34 @@
         clean src-clean gtags-clean \
         test-clean doc-clean doc_inner-clean
 
-CMD := casl2 comet2 dumpword
+CMD := casl2 comet2 dumpword casl2rev
 
 CAT := cat
 CP := cp
-ECHO := echo
-GITTAG := git tag
+ECHO := /bin/echo
+EXPR := expr
+GIT := git
 GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed
+WC := wc
 WHICH := which
+XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
+libdir ?= $(prefix)/share
+
+VERSION := $(shell $(CAT) VERSION)
+
+VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
+
+MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
 
-VERSION = $(shell $(CAT) VERSION)
 VERSIONFILES = include/package.h \
-        test/system/casl2/opt_v/0.txt \
-        test/system/comet2/opt_v/0.txt \
+        test/system/casl2_opt/opt_v/0.txt \
+        test/system/comet2_opt/opt_v/0.txt \
         test/system/dumpword/opt_v/0.txt
 
 all: build doc gtags
@@ -56,6 +65,12 @@ install: casl2 comet2 dumpword install-info install-casl2lib
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) $(CMD) $(bindir)/
 
+install-info:
+	$(MAKE) -C doc install-info
+
+install-casl2lib:
+	$(MAKE) -C as/casl2lib install-casl2lib
+
 uninstall: uninstall-info uninstall-casl2lib
 	$(RM) $(prefix $(bindir)/,$(CMD))
 
@@ -65,8 +80,8 @@ version: $(VERSIONFILES)
 $(VERSIONFILES): VERSION
 	@$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
 
-gittag: VERSION
-	$(GITTAG) | $(GREP) $(VERSION) || $(GITTAG) $(VERSION)
+gittag:
+	if test `$(GIT) status -s | $(WC) -l` -gt 0; then $(ECHO) "Error: commit, first."; exit 1; fi; if test "$(VERSIONGITREF)" != "$(MASTERGITREF)"; then $(GIT) tag $(VERSION); fi
 
 distclean: cmd-clean src-distclean gtags-clean version-clean clean