Index: gsdl/trunk/common-src/src/gdbmedit/db2txt/win32.mak
===================================================================
--- gsdl/trunk/common-src/src/gdbmedit/db2txt/win32.mak	(revision 16570)
+++ gsdl/trunk/common-src/src/gdbmedit/db2txt/win32.mak	(revision 16574)
@@ -25,7 +25,9 @@
 ###########################################################################
 
-GSDLHOME = ..\..
+GSDLHOME = ..\..\..\..\..
+COMMONHOME = $(GSDLHOME)\common-src
+
 GSDL_VC4 = 0
-STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
+STLPATH = "$(COMMONHOME)\packages\windows\stlport\stlport"
 
 AR = lib
@@ -41,6 +43,6 @@
 
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE
-INCLUDES = -I"$(GSDLHOME)\src\db2txt" -I"$(GSDLHOME)\src\lib" -I"$(GSDLHOME)\packages\mg\lib" \
-	   -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
+INCLUDES = -I"$(COMMONHOME)\src\db2txt" -I"$(COMMONHOME)\src\lib" -I"$(COMMONHOME)\indexers\mg\lib" \
+	   -I"$(COMMONHOME)\packages\windows\gdbm\gdbm"
 !IF $(GSDL_VC4)
 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
@@ -48,6 +50,6 @@
 !ENDIF
 
-LIBS = "$(GSDLHOME)\indexers\mg\lib\unitool.obj" "$(GSDLHOME)\src\lib\gsdllib.lib" \
-       "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
+LIBS = "$(COMMONHOME)\indexers\mg\lib\unitool.obj" "$(COMMONHOME)\src\lib\gsdllib.lib" \
+       "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
 
 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
Index: gsdl/trunk/common-src/src/gdbmedit/gdbmget/win32.mak
===================================================================
--- gsdl/trunk/common-src/src/gdbmedit/gdbmget/win32.mak	(revision 16570)
+++ gsdl/trunk/common-src/src/gdbmedit/gdbmget/win32.mak	(revision 16574)
@@ -25,7 +25,9 @@
 ###########################################################################
 
-GSDLHOME = ..\..\..\..
+GSDLHOME = ..\..\..\..\..
+COMMONHOME = $(GSDLHOME)\common-src
+
 USE_STLPORT = 0
-STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
+STLPATH = "$(COMMONHOME)packages\windows\stlport\stlport"
 
 AR = lib
@@ -35,6 +37,5 @@
 
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H
-INCLUDES = -I"$(GSDLHOME)\lib" \
-	   -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
+INCLUDES = -I"$(COMMONHOME)\packages\windows\gdbm\gdbm"
 !IF $(USE_STLPORT)
 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
@@ -42,5 +43,5 @@
 !ENDIF
 
-LIBS = "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
+LIBS = "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
 
 COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
Index: gsdl/trunk/common-src/src/gdbmedit/gdbmset/win32.mak
===================================================================
--- gsdl/trunk/common-src/src/gdbmedit/gdbmset/win32.mak	(revision 16570)
+++ gsdl/trunk/common-src/src/gdbmedit/gdbmset/win32.mak	(revision 16574)
@@ -25,7 +25,9 @@
 ###########################################################################
 
-GSDLHOME = ..\..\..\..
+GSDLHOME = ..\..\..\..\..
+COMMONHOME = $(GSDLHOME)\common-src
+
 USE_STLPORT = 0
-STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
+STLPATH = "$(COMMONHOME)\packages\windows\stlport\stlport"
 
 AR = lib
@@ -35,6 +37,5 @@
 
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H
-INCLUDES = -I"$(GSDLHOME)\lib" \
-	   -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
+INCLUDES = -I"$(COMMONHOME)\packages\windows\gdbm\gdbm"
 !IF $(USE_STLPORT)
 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
@@ -42,5 +43,5 @@
 !ENDIF
 
-LIBS = "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
+LIBS = "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
 
 COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
Index: gsdl/trunk/common-src/src/gdbmedit/txt2db/win32.mak
===================================================================
--- gsdl/trunk/common-src/src/gdbmedit/txt2db/win32.mak	(revision 16570)
+++ gsdl/trunk/common-src/src/gdbmedit/txt2db/win32.mak	(revision 16574)
@@ -25,7 +25,9 @@
 ###########################################################################
 
-GSDLHOME = ..\..
+GSDLHOME = ..\..\..\..\..
+COMMONHOME = $(GSDLHOME)\common-src
+
 GSDL_VC4 = 0
-STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
+STLPATH = "$(COMMONHOME)\packages\windows\stlport\stlport"
 
 AR = lib
@@ -41,6 +43,6 @@
 
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE
-INCLUDES = -I"$(GSDLHOME)\src\txt2db" -I"$(GSDLHOME)\src\lib" -I"$(GSDLHOME)\indexers\mg\lib" \
-	   -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
+INCLUDES = -I"$(COMMONHOME)\src\txt2db" -I"$(COMMONHOME)\src\lib" -I"$(COMMONHOME)\indexers\mg\lib" \
+	   -I"$(COMMONHOME)\packages\windows\gdbm\gdbm"
 !IF $(GSDL_VC4)
 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
@@ -48,6 +50,6 @@
 !ENDIF
 
-LIBS = "$(GSDLHOME)\indexers\mg\lib\unitool.obj" "$(GSDLHOME)\src\lib\gsdllib.lib" \
-       "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
+LIBS = "$(COMMONHOME)\indexers\mg\lib\unitool.obj" "$(COMMONHOME)\src\lib\gsdllib.lib" \
+       "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
 
 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
