15 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index e17703ac..8117692e 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ install: $(INSTALL_DEP)
           $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
           $(RM) $(FILE_PC).tmp
         cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
-        cd lib && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
+        cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
         @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
         @echo ""
         @echo "Note: the beta releases deliberately do NOT install a symlink for luajit"
diff --git a/doc/install.html b/doc/install.html
index 3731b305..f487958d 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -329,7 +329,7 @@ Then follow the installation instructions below.
 Copy <tt>luajit.exe</tt> and <tt>lua51.dll</tt> (built in the <tt>src</tt>
 directory) to a newly created directory (any location is ok).
 Add <tt>lua</tt> and <tt>lua\jit</tt> directories below it and copy
-all Lua files from the <tt>lib</tt> directory of the distribution
+all Lua files from the <tt>src\jit</tt> directory of the distribution
 to the latter directory.
 </p>
 <p>
diff --git a/src/Makefile b/src/Makefile
index a0e98068..5977c373 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -401,7 +401,7 @@ LJCORE_O= lj_gc.o lj_err.o lj_char.o lj_bc.o lj_obj.o \
 LJVMCORE_O= $(LJVM_O) $(LJCORE_O)
 LJVMCORE_DYNO= $(LJVMCORE_O:.o=_dyn.o)
 
-LIB_VMDEF= ../lib/vmdef.lua
+LIB_VMDEF= jit/vmdef.lua
 LIB_VMDEFP= $(LIB_VMDEF)
 
 LUAJIT_O= luajit.o
diff --git a/lib/.gitignore b/src/jit/.gitignore
index 500e2855..500e2855 100644
--- a/lib/.gitignore
+++ b/src/jit/.gitignore
diff --git a/lib/bc.lua b/src/jit/bc.lua
index 15317bcd..15317bcd 100644
--- a/lib/bc.lua
+++ b/src/jit/bc.lua
diff --git a/lib/bcsave.lua b/src/jit/bcsave.lua
index 70cb6925..70cb6925 100644
--- a/lib/bcsave.lua
+++ b/src/jit/bcsave.lua
diff --git a/lib/dis_arm.lua b/src/jit/dis_arm.lua
index 0fcd1bed..0fcd1bed 100644
--- a/lib/dis_arm.lua
+++ b/src/jit/dis_arm.lua
diff --git a/lib/dis_mips.lua b/src/jit/dis_mips.lua
index 2edfdf40..2edfdf40 100644
--- a/lib/dis_mips.lua
+++ b/src/jit/dis_mips.lua
diff --git a/lib/dis_mipsel.lua b/src/jit/dis_mipsel.lua
index 4c5a6515..4c5a6515 100644
--- a/lib/dis_mipsel.lua
+++ b/src/jit/dis_mipsel.lua
diff --git a/lib/dis_ppc.lua b/src/jit/dis_ppc.lua
index ad8599fc..ad8599fc 100644
--- a/lib/dis_ppc.lua
+++ b/src/jit/dis_ppc.lua
diff --git a/lib/dis_x64.lua b/src/jit/dis_x64.lua
index d95d7ded..d95d7ded 100644
--- a/lib/dis_x64.lua
+++ b/src/jit/dis_x64.lua
diff --git a/lib/dis_x86.lua b/src/jit/dis_x86.lua
index 5aeeb449..5aeeb449 100644
--- a/lib/dis_x86.lua
+++ b/src/jit/dis_x86.lua
diff --git a/lib/dump.lua b/src/jit/dump.lua
index 3d62c4ea..3d62c4ea 100644
--- a/lib/dump.lua
+++ b/src/jit/dump.lua
diff --git a/lib/v.lua b/src/jit/v.lua
index 8f58fe3b..8f58fe3b 100644
--- a/lib/v.lua
+++ b/src/jit/v.lua
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 09782db4..63467308 100644
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -46,7 +46,7 @@ buildvm -m libdef -o lj_libdef.h %ALL_LIB%
 @if errorlevel 1 goto :BAD

 buildvm -m recdef -o lj_recdef.h %ALL_LIB%

 @if errorlevel 1 goto :BAD

-buildvm -m vmdef -o ..\lib\vmdef.lua %ALL_LIB%

+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%

 @if errorlevel 1 goto :BAD

 buildvm -m folddef -o lj_folddef.h lj_opt_fold.c

 @if errorlevel 1 goto :BAD