SERVER-41663 Make hygienic variable names match autoconf

4 files changed, 20 insertions, 22 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 4d657c05539..ab626aea4d4 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -461,9 +461,7 @@ mongod = env.Program(
 
 hygienic = get_option('install-mode') == 'hygienic'
 
-if hygienic:
-    env.Default('$INSTALL_DIR/bin/mongod$PROGSUFFIX')
-else:
+if not hygienic:
     env.Default(env.Install('#/', mongod))
 
 # tools
@@ -721,7 +719,7 @@ def installBinary( e, name ):
     else:
         distBinaries.append(name)
 
-    inst = e.Install( "$INSTALL_DIR/bin", name )
+    inst = e.Install( "$DESTDIR/bin", name )
 
     if env.TargetOSIs('posix'):
         e.AddPostAction( inst, 'chmod 755 $TARGET' )
@@ -733,7 +731,7 @@ def installExternalBinary( e, name_str ):
 
     if hygienic:
         env.AutoInstall(
-            target='$PREFIX_BIN_DIR',
+            target='$PREFIX_BINDIR',
             source=[
                 name
             ],
@@ -744,7 +742,7 @@ def installExternalBinary( e, name_str ):
 
     distBinaries.append(name)
 
-    inst = e.Install( "$INSTALL_DIR/bin", name )
+    inst = e.Install( "$DESTDIR/bin", name )
 
     if env.TargetOSIs('posix'):
         e.AddPostAction( inst, 'chmod 755 $TARGET' )
@@ -755,7 +753,7 @@ if has_option("use-new-tools"):
 
     if hygienic:
         env.AutoInstall(
-            target='$INSTALL_DIR',
+            target='$DESTDIR',
             source=env.File('#/src/mongo-tools/distsrc/THIRD-PARTY-NOTICES.gotools'),
             AIB_COMPONENT='tools',
             AIB_ROLE='base',
@@ -789,7 +787,7 @@ if not hygienic:
 distsrc = env.Dir('#distsrc')
 if hygienic:
     env.AutoInstall(
-        target='$INSTALL_DIR',
+        target='$DESTDIR',
         source=[
             distsrc.File('README'),
             # TODO: we need figure out what to do when we use a different
@@ -808,7 +806,7 @@ else:
 enterprise_license = [banner for banner in env["MODULE_BANNERS"] if banner.name ==  "LICENSE-Enterprise.txt"]
 if hygienic:
     env.AutoInstall(
-        target='$INSTALL_DIR',
+        target='$DESTDIR',
         source=[
             enterprise_license[0]
             if enterprise_license else distsrc.File('LICENSE-Community.txt'),
@@ -867,10 +865,10 @@ compass_installer = env.Substfile('#/src/mongo/installer/compass/' + compass_scr
 distBinaries.append(compass_installer)
 
 if not hygienic:
-    compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
+    compass_script_installer = env.Install("$DESTDIR/bin", compass_installer)
 else:
     compass_script_installer = env.AutoInstall(
-        target='$PREFIX_BIN_DIR',
+        target='$PREFIX_BINDIR',
         source=[
             compass_installer,
         ],
@@ -933,4 +931,4 @@ env.NoCache(debug_symbols_dist)
 
 #final alias
 if not hygienic:
-    env.Alias( "install", "$INSTALL_DIR" )
+    env.Alias( "install", "$DESTDIR" )
diff --git a/src/mongo/embedded/mongo_embedded/SConscript b/src/mongo/embedded/mongo_embedded/SConscript
index 1242317ba1d..cd09d587b71 100644
--- a/src/mongo/embedded/mongo_embedded/SConscript
+++ b/src/mongo/embedded/mongo_embedded/SConscript
@@ -10,7 +10,7 @@ env = env.Clone()
 
 if get_option('install-mode') == 'hygienic':
     env.AutoInstall(
-        '$PREFIX_DOC_DIR/mongo_embedded',
+        '$PREFIX_DOCDIR/mongo_embedded',
         source=[
             '#/LICENSE-Community.txt',
             '../LICENSE-Embedded.txt',
@@ -76,7 +76,7 @@ mongoEmbeddedTargets = mongoEmbeddedEnv.Library(
 
 if get_option('install-mode') == 'hygienic':
     env.AutoInstall(
-        '$INSTALL_DIR/include/mongo_embedded/v1/mongo_embedded',
+        '$PREFIX_INCLUDEDIR/mongo_embedded/v1/mongo_embedded',
         source=['mongo_embedded.h'],
         AIB_COMPONENT='embedded',
         AIB_ROLE='dev',
@@ -122,7 +122,7 @@ if get_option('link-model') != 'dynamic-sdk':
 if get_option('link-model') != 'dynamic-sdk' or get_option('install-mode') != 'hygienic' or not env.TargetOSIs('darwin') or env.TargetOSIs('macOS'):
     Return()
 
-frameworkDir = env.Dir('$INSTALL_DIR/Frameworks/mongo_embedded.framework')
+frameworkDir = env.Dir('$DESTDIR/Frameworks/mongo_embedded.framework')
 env.Alias('install-embedded-dev', frameworkDir)
 
 resourceDir = frameworkDir
@@ -171,7 +171,7 @@ env.AddPostAction(
 
 mongoEmbeddedDSYM = getattr(mongoEmbeddedTargets[0].attributes, "separate_debug_file", None)
 if mongoEmbeddedDSYM:
-    frameworkDSYMDir = '$INSTALL_DIR/Frameworks/mongo_embedded.framework.dSYM'
+    frameworkDSYMDir = '$DESTDIR/Frameworks/mongo_embedded.framework.dSYM'
     env.Alias('install-embedded-dev', frameworkDSYMDir)
 
     env.InstallAs(
diff --git a/src/mongo/embedded/mongoc_embedded/SConscript b/src/mongo/embedded/mongoc_embedded/SConscript
index 962dfefce6a..6472ac0b8a2 100644
--- a/src/mongo/embedded/mongoc_embedded/SConscript
+++ b/src/mongo/embedded/mongoc_embedded/SConscript
@@ -12,7 +12,7 @@ if not env['MONGO_HAVE_LIBMONGOC']:
 
 if get_option('install-mode') == 'hygienic':
     env.AutoInstall(
-        '$INSTALL_DIR/share/doc/mongoc_embedded',
+        '$PREFIX_DOCDIR/mongoc_embedded',
         source=[
             '#/LICENSE-Community.txt',
             '../LICENSE-Embedded.txt',
@@ -76,7 +76,7 @@ mongocEmbeddedTargets = mongocEmbeddedEnv.Library(
 
 if get_option('install-mode') == 'hygienic':
     env.AutoInstall(
-        '$INSTALL_DIR/include/mongoc_embedded/v1/mongoc_embedded',
+        '$PREFIX_INCLUDEDIR/mongoc_embedded/v1/mongoc_embedded',
         source=['mongoc_embedded.h'],
         AIB_COMPONENT='embedded',
         AIB_ROLE='dev'
@@ -119,7 +119,7 @@ if get_option('link-model') != 'dynamic-sdk':
 if get_option('link-model') != 'dynamic-sdk' or get_option('install-mode') != 'hygienic' or not env.TargetOSIs('darwin') or env.TargetOSIs('macOS'):
     Return()
 
-frameworkDir = env.Dir('$INSTALL_DIR/Frameworks/mongoc_embedded.framework')
+frameworkDir = env.Dir('$DESTDIR/Frameworks/mongoc_embedded.framework')
 env.Alias('install-embedded-dev', frameworkDir)
 
 resourceDir = frameworkDir
@@ -133,7 +133,7 @@ env.Install(
             'LICENSE-Community.txt',
             'LICENSE-Embedded.txt',
         ],
-        directory=env.Dir('$INSTALL_DIR/share/doc/mongoc_embedded'),
+        directory=env.Dir('$PREFIX_DOCDIR/mongoc_embedded'),
     ),
 )
 
@@ -180,7 +180,7 @@ env.AddPostAction(
 
 mongocEmbeddedDSYM = getattr(mongocEmbeddedTargets[0].attributes, "separate_debug_file", None)
 if mongocEmbeddedDSYM:
-    frameworkDSYMDir = '$INSTALL_DIR/Frameworks/mongoc_embedded.framework.dSYM'
+    frameworkDSYMDir = '$DESTDIR/Frameworks/mongoc_embedded.framework.dSYM'
     env.Alias('install-embedded-dev', frameworkDSYMDir)
 
     env.InstallAs(
diff --git a/src/mongo/embedded/stitch_support/SConscript b/src/mongo/embedded/stitch_support/SConscript
index ac781fe3f8c..b1090b97371 100644
--- a/src/mongo/embedded/stitch_support/SConscript
+++ b/src/mongo/embedded/stitch_support/SConscript
@@ -51,7 +51,7 @@ stitchSupportTargets = stitchSupportEnv.Library(
 
 if get_option('install-mode') == 'hygienic':
     env.AutoInstall(
-        '$INSTALL_DIR/include/stitch_support/v1/stitch_support',
+        '$PREFIX_INCLUDEDIR/stitch_support/v1/stitch_support',
         source=['stitch_support.h'],
         AIB_COMPONENT='stitch-support',
         AIB_ROLE='dev',