Merge branch 'master' of github.com:mroonga/mroonga

.gitignore

@@ -56,3 +56,5 @@ cmake_install.cmake
 /CMakeCache.txt
 /CMakeFiles/
 /INSTALL
+/packages/apt/tmp/
+/packages/yum/tmp/

Makefile.am

@@ -146,5 +146,5 @@ misc:
 	  echo "\$$(CUTTER_SOURCE_PATH) is missing"; \
 	  exit 1; \
 	fi
-	ln -s "$(CUTTER_SOURCE_PATH)/misc" misc;
+	ln -s "$(CUTTER_SOURCE_PATH)/misc" misc
 

build/makefiles/sphinx-build.am

@@ -24,7 +24,11 @@ SPHINX_BUILD_COMMAND =				\
 if DOCUMENT_BUILDABLE
 sphinx-ensure-updated:
 	if ! $(SPHINX_BUILD_COMMAND) 2>&1 | head -1 | grep 'v1.[2]' -q > /dev/null; then \
-	  (cd $(SPHINX_DIR) && $(HG) pull --update);					 \
+	  if test -d $(SPHINX_DIR); then						 \
+	    (cd $(SPHINX_DIR) && $(HG) pull --update);					 \
+	  else										 \
+	    $(HG) clone https://bitbucket.org/birkenfeld/sphinx $(SPHINX_DIR);		 \
+	  fi;										 \
 	fi
 else
 sphinx-ensure-updated: