From a1c0042a1e95d5329bceb3650219e804f080de10 Mon Sep 17 00:00:00 2001
From: Sandeep Thakkar <sandeep.thakkar@enterprisedb.com>
Date: Wed, 19 Oct 2016 14:10:28 +0100
Subject: [PATCH] Use config_distro.py for all settings, and don't
 create/overwrite config_local.py. Partly fixes #1849

---
 Make.bat         | 3 ---
 pkg/mac/build.sh | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Make.bat b/Make.bat
index 9ab7773e7..bf1707c7f 100644
--- a/Make.bat
+++ b/Make.bat
@@ -247,9 +247,6 @@ GOTO:EOF
     ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%PGBUILDPATH%\web\config_distro.py"
     ECHO MINIFY_HTML = False >> "%PGBUILDPATH%\web\config_distro.py"
 
-    ECHO Creating config_local.py
-    ECHO # Add any configuration changes to this file. > "%PGBUILDPATH%\web\config_local.py"
-
     ECHO Building docs...
     MKDIR "%PGBUILDPATH%\docs\en_US\html"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
diff --git a/pkg/mac/build.sh b/pkg/mac/build.sh
index 1faee0824..2388e4226 100755
--- a/pkg/mac/build.sh
+++ b/pkg/mac/build.sh
@@ -156,9 +156,9 @@ _complete_bundle() {
     cp -r $SOURCEDIR/web "$BUILDROOT/$APP_BUNDLE_NAME/Contents/Resources/" || exit 1
     cd "$BUILDROOT/$APP_BUNDLE_NAME/Contents/Resources/web"
     rm -f pgadmin4.db config_local.*
-    echo "SERVER_MODE = False" > config_local.py
-    echo "MINIFY_HTML = False" >> config_local.py
-    echo "HELP_PATH = '../../../docs/en_US/html/'" >> config_local.py
+    echo "SERVER_MODE = False" > config_distro.py
+    echo "MINIFY_HTML = False" >> config_distro.py
+    echo "HELP_PATH = '../../../docs/en_US/html/'" >> config_distro.py
 
     # Remove the .pyc files if any
     cd "$BUILDROOT/$APP_BUNDLE_NAME"