Index: tools/deploy.bat
==================================================================
--- tools/deploy.bat
+++ tools/deploy.bat
@@ -61,10 +61,16 @@
 
 IF DEFINED DUMMY2 (
   GOTO usage
 )
 
+IF NOT DEFINED DIRNAME (
+  SET DIRNAME=pkg_r_an_d
+)
+
+%_VECHO% DirName = '%DIRNAME%'
+
 REM ****************************************************************************
 REM ************************* Check Source Directories *************************
 REM ****************************************************************************
 
 IF NOT EXIST "%SOURCE%" (
@@ -106,25 +112,25 @@
 CALL :fn_ResetErrorLevel
 
 REM ****************************************************************************
 
 FOR %%F IN (%PKGFILES%) DO (
-  %__ECHO% XCOPY "%SOURCE%\client\1.0\%%F" "%TARGET%\pkg_r_an_d\" %FFLAGS% %DFLAGS%
+  %__ECHO% XCOPY "%SOURCE%\client\1.0\%%F" "%TARGET%\%DIRNAME%\" %FFLAGS% %DFLAGS%
 
   IF ERRORLEVEL 1 (
-    ECHO Failed to copy "%SOURCE%\client\1.0\%%F" to "%TARGET%\pkg_r_an_d\".
+    ECHO Failed to copy "%SOURCE%\client\1.0\%%F" to "%TARGET%\%DIRNAME%\".
     GOTO errors
   )
 )
 
 REM ****************************************************************************
 
 FOR %%F IN (%EAGLEFILES%) DO (
-  %__ECHO% XCOPY "%SOURCE%\externals\Eagle\lib\Eagle1.0\%%F" "%TARGET%\pkg_r_an_d\Eagle1.0\" %FFLAGS% %DFLAGS%
+  %__ECHO% XCOPY "%SOURCE%\externals\Eagle\lib\Eagle1.0\%%F" "%TARGET%\%DIRNAME%\Eagle1.0\" %FFLAGS% %DFLAGS%
 
   IF ERRORLEVEL 1 (
-    ECHO Failed to copy "%SOURCE%\externals\Eagle\lib\Eagle1.0\%%F" to "%TARGET%\pkg_r_an_d\Eagle1.0\".
+    ECHO Failed to copy "%SOURCE%\externals\Eagle\lib\Eagle1.0\%%F" to "%TARGET%\%DIRNAME%\Eagle1.0\".
     GOTO errors
   )
 )
 
 REM ****************************************************************************