diff --git a/Makefile b/Makefile
index f052bc55c..7be8f9d08 100644
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,8 @@ include Makefile.def
 
 all: 
 ifdef MKDIR
-	$(MKDIR) $(HOME)/bin
-	$(MKDIR) $(HOME)/lib
+	$(MKDIR) $(PROJHOME)/bin
+	$(MKDIR) $(PROJHOME)/lib
 endif
 	@( \
 	for f in $(DIRS); \
@@ -60,8 +60,8 @@ OpenSees: tcl
 
 tcl:
 ifdef MKDIR
-	$(MKDIR) $(HOME)/bin
-	$(MKDIR) $(HOME)/lib
+	$(MKDIR) $(PROJHOME)/bin
+	$(MKDIR) $(PROJHOME)/lib
 endif
 	@$(ECHO) Building OpenSees Program ..;
 	@$(CD) $(FE)/tcl;  $(MAKE) tcl;
@@ -78,8 +78,8 @@ OpenSeesPy: python
 
 python: 
 ifdef MKDIR
-	$(MKDIR) $(HOME)/bin
-	$(MKDIR) $(HOME)/lib
+	$(MKDIR) $(PROJHOME)/bin
+	$(MKDIR) $(PROJHOME)/lib
 endif
 	@( \
 	for f in $(DIRS); \
@@ -93,8 +93,8 @@ endif
 
 pythonmain: 
 ifdef MKDIR
-	$(MKDIR) $(HOME)/bin
-	$(MKDIR) $(HOME)/lib
+	$(MKDIR) $(PROJHOME)/bin
+	$(MKDIR) $(PROJHOME)/lib
 endif
 	@( \
 	for f in $(DIRS); \
diff --git a/SRC/Makefile b/SRC/Makefile
index 88f91c169..944a313ae 100644
--- a/SRC/Makefile
+++ b/SRC/Makefile
@@ -63,8 +63,8 @@ all:
 	@$(AR) $(ARFLAGS) $(FE_LIBRARY) $(FMK_LIBS)
 	@$(AR) $(ARFLAGS) $(FE_LIBRARY) $(KJE_LIBS)
 	@$(RANLIB) $(RANLIBFLAGS) $(FE_LIBRARY)
-	@$(AR) $(ARFLAGS) $(HOME)/lib/libOpenSeesTclCommands.a $(TCL_COMMAND_LIBS)
-	@$(RANLIB) $(RANLIBFLAGS) $(HOME)/lib/libOpenSeesTclCommands.a 
+	@$(AR) $(ARFLAGS) $(OPENSEESHOME)/lib/libOpenSeesTclCommands.a $(TCL_COMMAND_LIBS)
+	@$(RANLIB) $(RANLIBFLAGS) $(OPENSEESHOME)/lib/libOpenSeesTclCommands.a 
 
 else
 
@@ -122,8 +122,8 @@ all:
 	@$(AR) $(ARFLAGS) $(FE_LIBRARY) $(KJE_LIBS)
 	@$(AR) $(ARFLAGS) $(FE_LIBRARY) $(ACTOR_LIBS)
 	@$(RANLIB) $(RANLIBFLAGS) $(FE_LIBRARY)
-	@$(AR) $(ARFLAGS) $(HOME)/lib/libOpenSeesTclCommands.a $(TCL_COMMAND_LIBS)
-	@$(RANLIB) $(RANLIBFLAGS) $(HOME)/lib/libOpenSeesTclCommands.a 
+	@$(AR) $(ARFLAGS) $(OPENSEESHOME)/lib/libOpenSeesTclCommands.a $(TCL_COMMAND_LIBS)
+	@$(RANLIB) $(RANLIBFLAGS) $(OPENSEESHOME)/lib/libOpenSeesTclCommands.a 
 
 endif
 
@@ -183,11 +183,11 @@ TCL_COMMAND_LIBS = $(FE)/domain/pattern/TclPatternCommand.o \
 
 
 skypack:
-	@$(CD) $(HOME)/lib; rm -f $(HOME)/lib/libskypack.a;
+	@$(CD) $(OPENSEESHOME)/lib; rm -f $(OPENSEESHOME)/lib/libskypack.a;
 	@$(CD) $(FE)/system_of_eqn/linearSOE/profileSPD/skypack; creator;
 
 metis:
-	@$(CD) $(HOME)/lib; rm -f $(METIS_LIBRARY);
+	@$(CD) $(OPENSEESHOME)/lib; rm -f $(METIS_LIBRARY);
 	@$(CD) $(FE)/graph/partitioner/metis-2.0; $(MAKE) clean;
 	@$(CD) $(FE)/graph/partitioner/metis-2.0; $(MAKE) lib;
 
diff --git a/SRC/interpreter/Makefile b/SRC/interpreter/Makefile
index 28cbeb0bb..69e9827ae 100644
--- a/SRC/interpreter/Makefile
+++ b/SRC/interpreter/Makefile
@@ -4,7 +4,7 @@ include ../../Makefile.def
 OBJS  = DL_Interpreter.o OpenSeesCommands.o OpenSeesUniaxialMaterialCommands.o OpenSeesElementCommands.o OpenSeesTimeSeriesCommands.o OpenSeesPatternCommands.o OpenSeesSectionCommands.o OpenSeesOutputCommands.o OpenSeesCrdTransfCommands.o OpenSeesBeamIntegrationCommands.o OpenSeesNDMaterialCommands.o OpenSeesMiscCommands.o OpenSeesParameterCommands.o OpenSeesFrictionModelCommands.o OpenSeesReliabilityCommands.o
 
 TclOBJS =  tclMain.o TclInterpreter.o TclWrapper.o $(OBJS)
-PythonOBJS = pythonMain.o PythonModule.o PythonWrapper.o $(OBJS)
+PythonOBJS = pythonMain.o PythonModule.o PythonWrapper.o $(OBJS) #
 PythonModuleOBJS = PythonModule.o PythonWrapper.o $(OBJS)
 
 # Compilation control
diff --git a/SRC/java/Makefile b/SRC/java/Makefile
index 5cf647e0e..223bcd932 100644
--- a/SRC/java/Makefile
+++ b/SRC/java/Makefile
@@ -6,7 +6,7 @@ include ../Makefile
 
 OBJS       = OpenSeesEvaluator.o OpenSeesEvaluatorKepler.o
 
-FE_LIBRARY      = $(HOME)/lib/libOpenSees.so 
+FE_LIBRARY      = $(OPENSEESHOME)/lib/libOpenSees.so 
 
 all: $(OBJS)
 
diff --git a/SRC/optimization/Makefile b/SRC/optimization/Makefile
index 9e531a54c..24d9aaee8 100644
--- a/SRC/optimization/Makefile
+++ b/SRC/optimization/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.def
 
 ifndef OPTIMIZATION_LIBRARY
-  OPTIMIZATION_LIBRARY = $(HOME)/lib/libOptimization.a
+  OPTIMIZATION_LIBRARY = $(OPENSEESHOME)/lib/libOptimization.a
 endif
 
 OPTIMIZATION_OBJS = $(FE)/optimization/domain/Optimization.o \
diff --git a/SRC/reliability/Makefile b/SRC/reliability/Makefile
index 0c75b173b..7ad0da756 100644
--- a/SRC/reliability/Makefile
+++ b/SRC/reliability/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.def
 
 ifndef RELIABILITY_LIBRARY
-  RELIABILITY_LIBRARY = $(HOME)/lib/libReliability.a
+  RELIABILITY_LIBRARY = $(OPENSEESHOME)/lib/libReliability.a
 endif
 
 RELIABILITY_OBJS = $(FE)/domain/pattern/DiscretizedRandomProcessSeries.o \
diff --git a/SRC/system_of_eqn/linearSOE/BJsolvers/Makefile b/SRC/system_of_eqn/linearSOE/BJsolvers/Makefile
index 806f1e72b..f7198deb6 100644
--- a/SRC/system_of_eqn/linearSOE/BJsolvers/Makefile
+++ b/SRC/system_of_eqn/linearSOE/BJsolvers/Makefile
@@ -12,7 +12,7 @@ all: $(OBJS)
 
 
 libBJsolvers.a: $(OBJS)
-	$(AR) -rv $(HOME)/lib/libBJsolvers.a $(OBJS)
+	$(AR) -rv $(OPENSEESHOME)/lib/libBJsolvers.a $(OBJS)
 
 # Miscellaneous
 tidy:	
diff --git a/SRC/system_of_eqn/linearSOE/mumps/Makefile b/SRC/system_of_eqn/linearSOE/mumps/Makefile
index 320d5adef..600d840dc 100644
--- a/SRC/system_of_eqn/linearSOE/mumps/Makefile
+++ b/SRC/system_of_eqn/linearSOE/mumps/Makefile
@@ -46,9 +46,9 @@ test: $(OBJS) example.o
 	$(MACHINE_SPECIFIC_LIBS) -o test
 
 test1: 
-	@$(CC) $(CFLAGS) $(INCLUDES) -I$(HOME)/MUMPS_4.6.4/include -c c_example.c   
+	@$(CC) $(CFLAGS) $(INCLUDES) -I$(OPENSEESHOME)/MUMPS_4.6.4/include -c c_example.c   
 	@$(LINKER) $(LINKFLAGS) c_example.o  mumps.o \
-	-L$(HOME)/MUMPS_4.6.4/lib \
+	-L$(OPENSEESHOME)/MUMPS_4.6.4/lib \
 	-ldmumps -lpord  -lessl -lpesslsmp -lblacssmp \
 	$(HPM_LIB) \
 	-lm \
@@ -56,7 +56,7 @@ test1:
 
 test2: c_example1.o
 	@$(LINKER) $(LINKFLAGS) c_example1.o  mumps.o \
-	-L$(HOME)/MUMPS_4.6.4/lib \
+	-L$(OPENSEESHOME)/MUMPS_4.6.4/lib \
 	-ldmumps -lpord  -lessl -lpesslsmp -lblacssmp \
 	$(HPM_LIB) \
 	$(FE)/actor/channel/MPI_Channel.o \