gitのブランチ名がmasterからmainに変わったことを反映

diff --git a/Makefile b/Makefile
index 29b1a1589e1b04ea68e25071771aab1579514015..d8b3b5c953b4b5e0093f391b3739f724404fd651 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ VERSION := $(shell $(CAT) VERSION)
 
 VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
 
-MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
+MAINGITREF := $(shell $(GIT) show-ref -s refs/heads/main)
 
 VERSIONFILES := include/version.h \
         test/system/casl2_opt/opt_v/0.txt \
@@ -90,7 +90,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)" != "$(MAINGITREF)"; then $(GIT) tag $(VERSION); fi
 
 copyright:
        $(SEDI) 's/Copyright (c) 2010-20[0-9][0-9]/Copyright (c) 2010-$(YEAR)/g' LICENSE README

diff --git a/VERSION b/VERSION
index c9a545efe46dff988f0bd98671eac90d83be6388..ecc83b5120ec1235d85b2f5f02e3b67a52a19ec6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.5p29
+v0.5p30