diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05ad38546a98a43f5acfc97aee57dbb5b07ab52a..804af8b5127a4570cdd50769f6d0afb4dc2fb0bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,12 +26,12 @@ message( STATUS "Building version ${VERSION}" )
 message( STATUS "CMAKE_INSTALL_PREFIX= ${CMAKE_INSTALL_PREFIX}" )
 
 # Options to pass down to moose-core
-option(WITH_DOC "Build documentation" OFF)
-option(DEBUG "Build with DEBUG support" OFF)
-option(WITH_BOOST "Use Boost libraries instead of GSL" OFF)
-option(WITH_CUDA "Use CUDA/GPU" OFF)
-option(WITH_MPI "Use MPI (experimental)" OFF)
-option(WITH_GUI "Install moose-gui. Works only with python2." ON )
+option(WITH_DOC   "Build documentation"                         OFF)
+option(DEBUG      "Build with DEBUG support"                    OFF)
+option(WITH_BOOST "Use Boost libraries instead of GSL"          OFF)
+option(WITH_CUDA  "Use CUDA/GPU"                                OFF)
+option(WITH_MPI   "Use MPI (experimental)"                      OFF)
+option(WITH_GUI   "Install moose-gui. Works only with python2." ON )
 
 # Required packages.
 find_package(PythonInterp REQUIRED)
diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt
index 349d580c9a7357cc4c243538a8e2ee228a66006c..20588f7afb1c2e0a4c805746b412dfdf21c332d0 100644
--- a/moose-core/CMakeLists.txt
+++ b/moose-core/CMakeLists.txt
@@ -415,7 +415,11 @@ find_package(PythonInterp REQUIRED)
 if(NOT PYMOOSE_BDIST_DIR)
     set(PYMOOSE_BDIST_DIR ${CMAKE_BINARY_DIR}/bdist)
 endif( )
-set(PYMOOSE_BDIST_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/pymoose_bdist_install)
+
+# If no one hsa set the PYMOOSE bdist installation directory, use default.
+if(NOT PYMOOSE_BDIST_INSTALL_DIR)
+    set(PYMOOSE_BDIST_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/pymoose_bdist_install)
+endif()
 file(MAKE_DIRECTORY ${PYMOOSE_BDIST_INSTALL_DIR})
 
 # We need a custom name for bdist; same on all platform.