X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=8bd9f1ad71c1994ad7acdb7f7aff582316fbc63e;hb=refs%2Ftags%2Fv0.2p33;hp=ca55acb0da7e55766fcf8644d9a8ffe81b604770;hpb=fd95f4b23c44e0164e06751b491797dc72545b27;p=YACASL2.git

diff --git a/Makefile b/Makefile
index ca55acb..8bd9f1a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,18 +10,29 @@ CMD := casl2 comet2 dumpword
 
 CAT := cat
 CP := cp
-ECHO := echo
-GITTAG := git tag
+ECHO := /bin/echo
+GIT := git
+GREP := grep
 GTAGS := gtags
 INSTALL := install
 SED := sed
 WHICH := which
+EXPR := expr
+XARGS := xargs
 
 prefix ?= ~
 bindir ?= $(prefix)/bin
 
-VERSION = $(shell $(CAT) VERSION)
-VERSIONFILES = include/package.h test/system/casl2/opt_v/0.txt test/system/comet2/opt_v/0.txt test/system/dumpword/opt_v/0.txt
+VERSION := $(shell $(CAT) VERSION)
+
+VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
+
+MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
+
+VERSIONFILES = include/package.h \
+        test/system/casl2/opt_v/0.txt \
+        test/system/comet2/opt_v/0.txt \
+        test/system/dumpword/opt_v/0.txt
 
 all: build doc gtags
 
@@ -61,8 +72,8 @@ version: $(VERSIONFILES)
 $(VERSIONFILES): VERSION
 	@$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
 
-gittag: 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