1 files changed, 16 insertions, 2 deletions
diff --git a/windows/pandoc-setup.iss b/windows/pandoc-setup.iss
index 18f37ebde..b9324d14a 100644
--- a/windows/pandoc-setup.iss
+++ b/windows/pandoc-setup.iss
@@ -12,7 +12,7 @@ AppPublisher=John MacFarlane
 AppPublisherURL=http://johnmacfarlane.net/pandoc/
 AppSupportURL=http://johnmacfarlane.net/pandoc/
 AppUpdatesURL=http://johnmacfarlane.net/pandoc/
-DefaultDirName={pf}\Pandoc
+DefaultDirName={code:DefDirRoot}\Pandoc
 DefaultGroupName=Pandoc
 AllowNoIcons=yes
 LicenseFile=C:\Documents and Settings\John MacFarlane\My Documents\src\pandoc\COPYING.txt
@@ -20,9 +20,10 @@ OutputBaseFilename=setup
 Compression=lzma
 SolidCompression=yes
 ChangesEnvironment=yes
+PrivilegesRequired=none
 
 [Tasks]
-Name: modifypath; Description: Add application directory to your system path
+Name: modifypath; Description: Add application directory to your path
 
 [Code]
 function ModPathDir(): TArrayOfString;
@@ -35,6 +36,19 @@ begin
 end;
 #include "modpath.iss"
 
+function IsRegularUser(): Boolean;
+begin
+    Result := not (IsAdminLoggedOn or IsPowerUserLoggedOn);
+end;
+
+function DefDirRoot(Param: String): String;
+begin
+if IsRegularUser then
+    Result := ExpandConstant('{localappdata}')
+else
+    Result := ExpandConstant('{pf}')
+end;
+
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"