[Groonga-mysql-commit] mroonga/mroonga at 1cb9e50 [master] Don't pass octal number as printf parameter

Back to archive index

HAYASHI Kentaro null+****@clear*****
Tue Oct 22 12:29:11 JST 2013


HAYASHI Kentaro	2013-10-22 12:29:11 +0900 (Tue, 22 Oct 2013)

  New Revision: 1cb9e509b65bf86741251094bbb3cbb04aa6439e
  https://github.com/mroonga/mroonga/commit/1cb9e509b65bf86741251094bbb3cbb04aa6439e

  Message:
    Don't pass octal number as printf parameter

  Modified files:
    Makefile.am

  Modified: Makefile.am (+15 -6)
===================================================================
--- Makefile.am    2013-10-08 17:21:44 +0900 (f2353e5)
+++ Makefile.am    2013-10-22 12:29:11 +0900 (b354ec1)
@@ -118,12 +118,21 @@ update-version:
 	@echo -n $(NEW_VERSION_MICRO) > $(srcdir)/version_micro
 	@echo -n $(NEW_VERSION_MAJOR).$(NEW_VERSION_MINOR)$(NEW_VERSION_MICRO) \
 	  > $(srcdir)/version
-	@printf "0x%02x%02x" \
-	  $(NEW_VERSION_MAJOR) $(NEW_VERSION_MINOR)$(NEW_VERSION_MICRO) \
-	  > $(srcdir)/version_in_hex
-	@printf "%d.%d" \
-	  $(NEW_VERSION_MAJOR) $(NEW_VERSION_MINOR)$(NEW_VERSION_MICRO) \
-	  > $(srcdir)/plugin_version
+	@if test $(NEW_VERSION_MINOR) -eq 0 ; then				\
+	  printf "0x%02x%02x"							\
+	    $(NEW_VERSION_MAJOR) $(NEW_VERSION_MICRO)				\
+	    > $(srcdir)/version_in_hex;						\
+	  printf "%d.%d"							\
+	    $(NEW_VERSION_MAJOR) $(NEW_VERSION_MICRO)				\
+	    > $(srcdir)/plugin_version;						\
+	else									\
+	  printf "0x%02x%02x"							\
+	    $(NEW_VERSION_MAJOR) $(NEW_VERSION_MINOR)$(NEW_VERSION_MICRO)	\
+	    > $(srcdir)/version_in_hex;						\
+	  printf "%d.%d" 							\
+	    $(NEW_VERSION_MAJOR) $(NEW_VERSION_MINOR)$(NEW_VERSION_MICRO) 	\
+	    > $(srcdir)/plugin_version;						\
+	fi
 
 upload-to-github:
 	ruby $(srcdir)/tools/upload-to-github.rb \
-------------- next part --------------
HTML����������������������������...
下载 



More information about the Groonga-mysql-commit mailing list
Back to archive index