From 2ccfde90d0970f869dcd7fb527e89c38ffaadb2b Mon Sep 17 00:00:00 2001
From: Mattias Gaertner <nc-gaertnma@netcologne.de>
Date: Fri, 19 Mar 2021 10:31:46 +0000
Subject: [PATCH] pas2js: fixed option --simpleserver and -d relative path

git-svn-id: trunk@49008 -
(cherry picked from commit 29dee4a0d3dd89e0d9e9c0808e8d29d6ddf59368)
---
 utils/pas2js/httpcompiler.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/pas2js/httpcompiler.pp b/utils/pas2js/httpcompiler.pp
index 8078bd71a6..a1cd77ee02 100644
--- a/utils/pas2js/httpcompiler.pp
+++ b/utils/pas2js/httpcompiler.pp
@@ -558,12 +558,13 @@ begin
   S:=Checkoptions('shqd:ni:p:wP::cm:',['help','quiet','noindexpage','directory:','port:','indexpage:','watch','project::','config:','simpleserver','mimetypes:']);
   if (S<>'') or HasOption('h','help') then
     usage(S);
-  FServeOnly:=HasOption('s','serve-only');
+  FServeOnly:=HasOption('s','simpleserver');
   Quiet:=HasOption('q','quiet');
   Port:=StrToIntDef(GetOptionValue('p','port'),3000);
   D:=GetOptionValue('d','directory');
   if D='' then
     D:=GetCurrentDir;
+  D:=ExpandFileName(D);
   if HasOption('m','mimetypes') then
     MimeTypesFile:=GetOptionValue('m','mimetypes');
   if MimeTypesFile='' then