From: j8takagi Date: Fri, 6 Jun 2014 08:36:14 +0000 (+0900) Subject: Makefileの細かい記述の修正 X-Git-Tag: v0.2p34~8 X-Git-Url: https://j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2334b6cb53c0bdea347da4b369602bdd8cf6fbbd;p=YACASL2.git Makefileの細かい記述の修正 --- diff --git a/Makefile b/Makefile index 8bd9f1a..e9e6678 100644 --- a/Makefile +++ b/Makefile @@ -11,13 +11,14 @@ CMD := casl2 comet2 dumpword CAT := cat CP := cp ECHO := /bin/echo +EXPR := expr GIT := git GREP := grep GTAGS := gtags INSTALL := install SED := sed +WC := wc WHICH := which -EXPR := expr XARGS := xargs prefix ?= ~ @@ -73,7 +74,7 @@ $(VERSIONFILES): VERSION @$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.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 + 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