postgrespro
diff --git a/‎build/helpers/genlists.py
Lines changed: 2 additions & 2 deletions b/‎build/helpers/genlists.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎build/helpers/postgres_nsis_installer.cmd
Lines changed: 3 additions & 2 deletions b/‎build/helpers/postgres_nsis_installer.cmd
Lines changed: 3 additions & 2 deletions
diff --git a/‎nsis/clientlist.nsi
Lines changed: 0 additions & 4 deletions b/‎nsis/clientlist.nsi
Lines changed: 0 additions & 4 deletions
diff --git a/‎nsis/postgresql.nsi
Lines changed: 3 additions & 0 deletions b/‎nsis/postgresql.nsi
Lines changed: 3 additions & 0 deletions
diff --git a/‎nsis/serverlist.nsi
Lines changed: 0 additions & 16 deletions b/‎nsis/serverlist.nsi
Lines changed: 0 additions & 16 deletions
@@ -42,9 +42,9 @@
         for f in sorted(found):
             filedir=os.path.dirname(f)
             if filedir !=curdir:
-                print >>out,"SetOutDir ${INSTDIR}"+filedir[1:]
+                print >>out,"SetOutPath $INSTDIR"+filedir[1:].replace("/","\\")
                 curdir=filedir
-            print >>out, "File ${PG_INS_SOURCE_DIR}"+f[1:]
+            print >>out, "File ${PG_INS_SOURCE_DIR}"+f[1:].replace("/","\\")
 
 # When all module files are processed:
 if len(filelist):
 
@@ -56,7 +56,8 @@ SET PG_DEF_PORT="%DEFAULT_PORT%"
 SET PG_DEF_SUPERUSER="%DEFAULT_USER%"
 SET PG_DEF_SERVICEACCOUNT="NT AUTHORITY\NetworkService"
 SET PG_DEF_BRANDING="%PRODUCT_NAME% %PG_MAJOR_VERSION% (%BITS%)"
-SET PG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql\*.*"
+rem SET PG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql\*.*"
+SET PG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql"
 
 SET NSIS_RES_DIR=%~dp0
 SET NSIS_RES_DIR=%NSIS_RES_DIR:~0,-1%
@@ -98,7 +99,7 @@ IF "%ARCH%" == "X64" (
 
 CD /D %NSIS_RES_DIR% || GOTO :ERROR
 rem Genarate file lists
-%PYTHON64_PATH%/python %ROOT%/build/helpers/genlists.py %INSTDIR% client.files devel.files plperl.files plpython2.files plpython3.files unneeded.files server.files
+%PYTHON64_PATH%/python %ROOT%/build/helpers/genlists.py %PG_INS_SOURCE_DIR% client.files devel.files plperl.files plpython2.files plpython3.files unneeded.files server.files
 
 rem generate installer itself
 makensis postgresql.nsi || GOTO :ERROR
 
@@ -303,6 +303,9 @@ Section $(PostgreSQLString) sec1
   ${endif}
 
   !include server_list.nsi
+  !include plperl_list.nsi
+  !include plpython2_list.nsi
+
   ;SetOutPath "$INSTDIR"
   ;File /r ${PG_INS_SOURCE_DIR}\*.*
   ;File /r ${PG_INS_SOURCE_DIR}\bin\*.*