Fix submodule names

Signed-off-by: Rudi Grinberg <[email protected]>
jfeser · May 11, 2021 · 312664f · 312664f
1 parent 9aa551c
commit 312664f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,21 +1,21 @@
-[submodule "vendor/merlin"]
+[submodule "ocaml-lsp-server/vendor/merlin"]
 path = ocaml-lsp-server/vendor/merlin
 url = https://github.com/rgrinberg/merlin
 branch = lsp
 ignore = dirty
-[submodule "vendor/cmdliner"]
+[submodule "ocaml-lsp-server/vendor/cmdliner"]
 path = ocaml-lsp-server/vendor/cmdliner
 url = https://github.com/dbuenzli/cmdliner.git
-[submodule "vendor/uutf"]
+[submodule "ocaml-lsp-server/vendor/uutf"]
 path = ocaml-lsp-server/vendor/uutf
 url = https://github.com/dune-universe/uutf.git
 branch = duniverse-v1.0.2
 ignore = dirty
-[submodule "vendor/octavius"]
+[submodule "ocaml-lsp-server/vendor/octavius"]
 path = ocaml-lsp-server/vendor/octavius
 url = https://github.com/ocaml-doc/octavius.git
 ignore = dirty
-[submodule "vendor/omd"]
+[submodule "ocaml-lsp-server/vendor/omd"]
 path = ocaml-lsp-server/vendor/omd
 url = https://github.com/ulugbekna/omd.git
 branch = ocaml-lsp

diff --git a/dune b/dune
@@ -1,4 +1,4 @@
-(vendored_dirs vendor submodules)
+(vendored_dirs vendor)
 
 (data_only_dirs submodules)
 

diff --git a/submodules/jbuilder → submodules/dune b/submodules/jbuilder → submodules/dune