aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2020-05-21 14:41:43 +0900
committerMichael Paquier <michael@paquier.xyz>2020-05-21 14:41:43 +0900
commit8de137017a158185b0dd022231aeb5ac2daede6b (patch)
treeb6b5556a3f8eb429b7655b1572d9c11d0c83e7c4 /src
parent781b6a3ea7eaadf8813ad86b5842a8148b01bbd9 (diff)
downloadpostgresql-8de137017a158185b0dd022231aeb5ac2daede6b.tar.gz
postgresql-8de137017a158185b0dd022231aeb5ac2daede6b.zip
Fix MSVC installations with multiple "configure" files detected
When installing binaries and libraries using the MSVC installation routines, the operation gets done after moving to the root folder, whose location is detected by checking if "configure" exists two times in a row. So, calling the installation script from src/tools/msvc/ with an extra "configure" file four levels up the root path of the code tree causes the execution to go further up, leading to a failure in finding the builds. This commit fixes the issue by moving to the root folder of the code tree only once, when necessary. Author: Arnold Müller Reviewed-by: Daniel Gustafsson Discussion: https://postgr.es/m/16343-f638f67e7e52b86c@postgresql.org Backpatch-through: 9.5
Diffstat (limited to 'src')
-rw-r--r--src/tools/msvc/Install.pm12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 7823f0ac618..4b1a4c7af71 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -62,8 +62,16 @@ sub Install
do "./config.pl" if (-f "config.pl");
}
- chdir("../../..") if (-f "../../../configure");
- chdir("../../../..") if (-f "../../../../configure");
+ # Move to the root path depending on the current location.
+ if (-f "../../../configure")
+ {
+ chdir("../../..");
+ }
+ elsif (-f "../../../../configure")
+ {
+ chdir("../../../..");
+ }
+
my $conf = "";
if (-d "debug")
{