Merge branch 'develop' into release_v0.2

issp-center-dev · Mar 16, 2017 · 0c6b5b5 · 0c6b5b5
2 parents be69f56 + 7db8ef4
commit 0c6b5b5
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/doc/userguide.html b/doc/userguide.html
@@ -0,0 +1,28 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type"
+          content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" CONTENT="IE=EmulateIE7" />
+    <title>mVMC manual</title>
+    <meta name="description" content="mVMC_manual">
+  </head>
+  <body>
+
+    <h1><p>mVMC manuals</p></h1>
+    <ul>
+      <li><h2><a href="./en/userguide_en.pdf" target="_blank">mVMC English manual</a></h2></li>
+      <li><h2><a href="./jp/userguide_jp.pdf" target="_blank">mVMC Japanese manual</a></h2></li>
+      <li><h2>
+          Fourier utility English manual (
+        <a href="./fourier/en/_build/html/index.html" target="_blank">HTML</a>/
+        <a href="./fourier/en/_build/latex/fourier.pdf" target="_blank">PDF</a>)
+      </h2></li>
+      <li><h2>
+          Fourier utility Japanese manual (
+        <a href="./fourier/ja/_build/html/index.html" target="_blank">HTML</a>/
+        <a href="./fourier/ja/_build/latex/fourier.pdf" target="_blank">PDF</a>)
+      </h2></li>
+    </ul>
+
+  </body>
+</html>
diff --git a/mVMCconfig.sh b/mVMCconfig.sh
@@ -139,8 +139,8 @@ mvmc:
 	cd tool;make -f makefile_tool
 
 userguide:
-	cd doc/jp/;make -f makefile_doc_jp;mv userguide_jp.pdf ../
-	cd doc/en/;make -f makefile_doc_en;mv userguide_en.pdf ../
+	cd doc/jp/;make -f makefile_doc_jp;
+	cd doc/en/;make -f makefile_doc_en;
 	cd doc/fourier/ja; make html latexpdfja
 	cd doc/fourier/en; make html latexpdfja
 
@@ -154,7 +154,6 @@ veryclean:
 	cd doc/en; make -f makefile_doc_en clean
 	cd doc/fourier/ja; make clean
 	cd doc/fourier/en; make clean
-	rm -f doc/userguide_??.pdf
 	rm -f src/make.sys makefile
 EOF
 fi