diff --git a/ravi-env.bat.in b/ravi-env.bat.in
index 9b56df8..f94b455 100644
--- a/ravi-env.bat.in
+++ b/ravi-env.bat.in
@@ -1,4 +1,4 @@
 set RAVI_HOME=@CMAKE_INSTALL_PREFIX@
-set PATH=%RAVI_HOME%\bin;%PATH%
+set PATH=%RAVI_HOME%\@CMAKE_INSTALL_BINDIR@;%PATH%
 set LUA_PATH=%RAVI_HOME%\share\lua\5.3\?.lua;%RAVI_HOME%\share\lua\5.3\?\init.lua;.\?.lua;.\?\init.lua
-set LUA_CPATH=%RAVI_HOME%\bin\?.dll
\ No newline at end of file
+set LUA_CPATH=%RAVI_HOME%\@CMAKE_INSTALL_BINDIR@\?.dll
\ No newline at end of file
diff --git a/ravi-env.linux.sh.in b/ravi-env.linux.sh.in
index aa72c85..cd7734c 100644
--- a/ravi-env.linux.sh.in
+++ b/ravi-env.linux.sh.in
@@ -1,5 +1,5 @@
 export RAVI_HOME=@CMAKE_INSTALL_PREFIX@
-export PATH=$RAVI_HOME/bin:$PATH
-export LD_LIBRARY_PATH=$RAVI_HOME/lib:$LD_LIBRARY_PATH
+export PATH=$RAVI_HOME/@CMAKE_INSTALL_BINDIR@:$PATH
+export LD_LIBRARY_PATH=$RAVI_HOME/@CMAKE_INSTALL_LIBDIR@:$LD_LIBRARY_PATH
 export LUA_PATH="$RAVI_HOME/share/lua/5.3/?.lua;$RAVI_HOME/share/lua/5.3/?/init.lua;./?.lua;./?/init.lua"
-export LUA_CPATH="$RAVI_HOME/lib/?.so;$RAVI_HOME/lib/lib?.so"
\ No newline at end of file
+export LUA_CPATH="$RAVI_HOME/@CMAKE_INSTALL_LIBDIR@/?.so;$RAVI_HOME/@CMAKE_INSTALL_LIBDIR@/lib?.so"
\ No newline at end of file
diff --git a/ravi-env.osx.sh.in b/ravi-env.osx.sh.in
index ee3af91..bd57bd1 100644
--- a/ravi-env.osx.sh.in
+++ b/ravi-env.osx.sh.in
@@ -1,6 +1,6 @@
-export RAVI_HOME=@CMAKE_INSTALL_PREFX@
-export PATH=$RAVI_HOME/bin:$PATH
-export DYLD_LIBRARY_PATH=$RAVI_HOME/lib:$DYLD_LIBRARY_PATH
+export RAVI_HOME=@CMAKE_INSTALL_PREFIX@
+export PATH=$RAVI_HOME/@CMAKE_INSTALL_BINDIR@:$PATH
+export DYLD_LIBRARY_PATH=$RAVI_HOME/@CMAKE_INSTALL_LIBDIR@:$DYLD_LIBRARY_PATH
 export LUA_PATH="$RAVI_HOME/share/lua/5.3/?.lua;$RAVI_HOME/share/lua/5.3/?/init.lua;./?.lua;./?/init.lua"
-export LUA_CPATH="$RAVI_HOME/lib/?.dylib;$RAVI_HOME/lib/lib?.dylib"
-export LUA_CPATH="$LUA_CPATH;$RAVI_HOME/lib/?.so;$RAVI_HOME/lib/lib?.so"
\ No newline at end of file
+export LUA_CPATH="$RAVI_HOME/@CMAKE_INSTALL_LIBDIR@/?.dylib;$RAVI_HOME/@CMAKE_INSTALL_LIBDIR@/lib?.dylib"
+export LUA_CPATH="$LUA_CPATH;$RAVI_HOME/@CMAKE_INSTALL_LIBDIR@/?.so;$RAVI_HOME/@CMAKE_INSTALL_LIBDIR@/lib?.so"
\ No newline at end of file