diff --git a/build.sh b/build.sh
index c132e70..9a1a1b4 100755
--- a/build.sh
+++ b/build.sh
@@ -76,3 +76,13 @@ cd ${BERKDB_ROOT}/PORT/${SYSTYPE}
 CC="gcc" make
 cd ${WORLD_ROOT}
 
+echo ""
+echo "===================================================================="
+echo " Building ${PROSPERO_ROOT}"
+echo "===================================================================="
+echo ""
+cd ${PROSPERO_ROOT}
+ln -sf Makefile.config.${SYSTYPE} Makefile.config
+make
+cd ${WORLD_ROOT}
+
diff --git a/prospero/Makefile b/prospero/Makefile
index caa8dd0..ca68745 100755
--- a/prospero/Makefile
+++ b/prospero/Makefile
@@ -8,7 +8,7 @@
 # This is the top level Makefile for the Prospero Directory Service.
 
 # Include configuration options.
-SOURCEBASE = .
+PROSPERO_ROOT = $(PROSPERO_ROOT)
 include Makefile.config
 
 # Programs that live in subdirectories, and have makefiles of their own.
diff --git a/prospero/Makefile.boilerplate b/prospero/Makefile.boilerplate
index d09a48d..fe9555e 100755
--- a/prospero/Makefile.boilerplate
+++ b/prospero/Makefile.boilerplate
@@ -14,7 +14,7 @@
 
 # Every Makefile in Prospero has (possibly unset) variables in it
 # named PROGS, SPECIAL_PROGS, DATA_FILE_TARGETS, OTHERPROGS, 
-#               CFILES, OBJECTS, SUBDIRS, SOURCEBASE
+#               CFILES, OBJECTS, SUBDIRS, PROSPERO_ROOT
 # PROGS:
 #   These are the programs which follow the default rule for making and 
 #   which are installed by default.  They will be deleted during cleanup.
@@ -36,7 +36,7 @@
 #    Special-purpose libraries are DATA_FILE_TARGETS
 # SUBDIRS:
 #    Subdirectories that this Makefile will recursively execute in.
-# SOURCEBASE:
+# PROSPERO_ROOT:
 # A relative path up to the top-level Makefile.
 
 
@@ -94,7 +94,7 @@ SED_SCRIPT = sed -e '/^[a-z0123456789_\/\.]*\.[ch]:/s,^,'$$i'\/,'
 
 ##### Prospero Include Files
 
-P_INC = -I$(SOURCEBASE)/include
+P_INC = -I$(PROSPERO_ROOT)/include
 
 # Used by all subsidiary makefiles on an as-needed basis.
 INCS    = $(P_INC) $(K_INC)
@@ -106,7 +106,7 @@ INCS    = $(P_INC) $(K_INC)
 ### descendants when they change.
 
 ## PASTHRU is officially dead now, because it is incompatible with never
-## having to specify the old SOURCEBASE.  --swa, 5/8/94
+## having to specify the old PROSPERO_ROOT.  --swa, 5/8/94
 ## 
 
 #PASTHRU =  \
@@ -136,24 +136,24 @@ INCS    = $(P_INC) $(K_INC)
 # The targets ending in _LIB are real file names of single libraries that
 # Prospero is compiled with.
 
-PFS_LIB	        = $(SOURCEBASE)/lib/pfs/libpfs.a
-FIL_LIB         = $(SOURCEBASE)/lib/filters/libfilter.a  
-CMP_LIB         = $(SOURCEBASE)/lib/pcompat/libpcompat.a
-RDP_LIB         = $(SOURCEBASE)/lib/ardp/libardp.a 
-SRV_LIB         = $(SOURCEBASE)/lib/psrv/libpsrv.a
-VCACHE_LIB      = $(SOURCEBASE)/user/vcache/libpvcache.a 
-GOPHER_GW_LIB   = $(SOURCEBASE)/lib/psrv/gopher_gw/libpgoph_gw.a
-WAIS_GW_LIB     = $(SOURCEBASE)/lib/psrv/wais_gw/libpwais_gw.a
+PFS_LIB	        = $(PROSPERO_ROOT)/lib/pfs/libpfs.a
+FIL_LIB         = $(PROSPERO_ROOT)/lib/filters/libfilter.a  
+CMP_LIB         = $(PROSPERO_ROOT)/lib/pcompat/libpcompat.a
+RDP_LIB         = $(PROSPERO_ROOT)/lib/ardp/libardp.a 
+SRV_LIB         = $(PROSPERO_ROOT)/lib/psrv/libpsrv.a
+VCACHE_LIB      = $(PROSPERO_ROOT)/user/vcache/libpvcache.a 
+GOPHER_GW_LIB   = $(PROSPERO_ROOT)/lib/psrv/gopher_gw/libpgoph_gw.a
+WAIS_GW_LIB     = $(PROSPERO_ROOT)/lib/psrv/wais_gw/libpwais_gw.a
 
 # For ARCHIE servers, version 3.  To use this, you will need to get the ARCHIE
 # distribution from Bunyip Information Systems.
-#ARCHIE2_LIB     = $(SOURCEBASE)/lib/psrv/archie2/libpsarchie.a
+#ARCHIE2_LIB     = $(PROSPERO_ROOT)/lib/psrv/archie2/libpsarchie.a
 
 
 # For ARCHIE servers, version 3.  To use this, you will need to get the ARCHIE
 # distribution from Bunyip Information Systems.
-#ARCHIE3_PSARCHIE_LIB     = $(SOURCEBASE)/lib/psrv/archie3/libpsarchie.a 
-ARCHIE3_PARCHIE_LIB     = $(SOURCEBASE)/lib/psrv/archie3/libparchie.a 
+#ARCHIE3_PSARCHIE_LIB     = $(PROSPERO_ROOT)/lib/psrv/archie3/libpsarchie.a 
+ARCHIE3_PARCHIE_LIB     = $(PROSPERO_ROOT)/lib/psrv/archie3/libparchie.a 
 
 #### LIBRARIES USED FOR ACTUALLY LINKING AND DEPENDENCIES
 
@@ -338,7 +338,7 @@ DIR1777 = $(VCACHE_DIR1777)
 ## if Makefile.config changes, recompile everything.
 ## For this rule to have any effect, Makefile.boilerplate must be included
 ## after $(OBJECTS) is set.
-##$(OBJECTS): $(SOURCEBASE)/Makefile.config
+##$(OBJECTS): $(PROSPERO_ROOT)/Makefile.config
 
 
 
@@ -417,7 +417,7 @@ etags:  TAGS
 	$(SUBDIRS_MAKE_START) etags $(SUBDIRS_MAKE_END) 
 
 TAGS:  $(CFILES) 
-	etags $(CFILES) $(SOURCEBASE)/misc/empty.c
+	etags $(CFILES) $(PROSPERO_ROOT)/misc/empty.c
 
 ###
 ### Rules and macros for checking out code with RCS
diff --git a/prospero/Makefile.config.aix-2 b/prospero/Makefile.config.aix-2
index 269f863..c27f6dc 100755
--- a/prospero/Makefile.config.aix-2
+++ b/prospero/Makefile.config.aix-2
@@ -171,14 +171,14 @@ TOPDIR = /pfs
 
 P_BINARIES	= $(TOPDIR)/bin
 
-#### SOURCEBASE
+#### PROSPERO_ROOT
 # The directory in which the top-level Prospero makefile exists.  This is the
 # root of the Prospero build directory/source directory you're using.
 # The Prospero Makefiles use this to compute library and include-file 
 # pathnames for the linker and compiler.
 
 # This actually does not need to be defined; each include file defines its own.
-# SOURCEBASE = /nfs/gost/build/10Mar94+19Apr94.patched
+# PROSPERO_ROOT = /nfs/gost/build/10Mar94+19Apr94.patched
 
 #### KERBEROS (K_INC, KRB_LIBS, KRB_LIBS_DEPENDENCIES)
 
@@ -226,7 +226,7 @@ LIBS_DEPENDENCIES=
 ## sure that lib/fsu_pthreads/lib/libpthreads.a and lib/malloc/gmalloc.o
 ## are included.  
 # LIBS += /nfs/pfs/prospero.build/sun4/lib/fsu_pthreads/lib/libpthreads.a /nfs/pfs/prospero.build/sun4/lib/malloc/gmalloc.o -lm
-# LIBS_DEPENDENCIES += $(SOURCEBASE)/lib/fsu_pthreads/lib/libpthreads.a $(SOURCEBASE)/lib/malloc/gmalloc.o
+# LIBS_DEPENDENCIES += $(PROSPERO_ROOT)/lib/fsu_pthreads/lib/libpthreads.a $(PROSPERO_ROOT)/lib/malloc/gmalloc.o
 
 ## if running multi-threaded under SOLARIS, add -lthread to LIBS:
 # LIBS += -lthread 
@@ -271,7 +271,7 @@ MORE_SERVER_PROGS =
 #SERVER_DB_LIBS_DEPENDENCIES= $(ARCHIE3_PARCHIE_LIB) $(ARCHIE3_PSARCHIE_LIB) 
 # Unimplemented format to read GOPHER data files; this does not work yet
 # and probably never will since it has been supserseded by the GOPHER-GW.
-#SERVER_DB_LIBS=  $(SOURCEBASE)/lib/psrv/gopher/libpgopher.a
+#SERVER_DB_LIBS=  $(PROSPERO_ROOT)/lib/psrv/gopher/libpgopher.a
 # For just GOPHER-GW
 SERVER_DB_LIBS=  $(GOPHER_GW_LIB) 
 SERVER_DB_LIBS_DEPENDENCIES = $(GOPHER_GW_LIB) 
@@ -437,4 +437,4 @@ INSTALL_EXE_MODE = 755
 INSTALL_DATA_MODE = 644
 
 ###
-include $(SOURCEBASE)/Makefile.boilerplate
+include $(PROSPERO_ROOT)/Makefile.boilerplate
diff --git a/prospero/Makefile.config.dist b/prospero/Makefile.config.dist
index 0429e42..8fa2559 100755
--- a/prospero/Makefile.config.dist
+++ b/prospero/Makefile.config.dist
@@ -171,14 +171,14 @@ TOPDIR = /usr/pfs
 
 P_BINARIES	= $(TOPDIR)/bin
 
-#### SOURCEBASE
+#### PROSPERO_ROOT
 # The directory in which the top-level Prospero makefile exists.  This is the
 # root of the Prospero build directory/source directory you're using.
 # The Prospero Makefiles use this to compute library and include-file 
 # pathnames for the linker and compiler.
 
 # This actually does not need to be defined; each include file defines its own.
-# SOURCEBASE = /nfs/gost/build/10Mar94+19Apr94.patched
+# PROSPERO_ROOT = /nfs/gost/build/10Mar94+19Apr94.patched
 
 #### KERBEROS (K_INC, KRB_LIBS, KRB_LIBS_DEPENDENCIES)
 
@@ -226,7 +226,7 @@ LIBS_DEPENDENCIES=
 ## sure that lib/fsu_pthreads/lib/libpthreads.a and lib/malloc/gmalloc.o
 ## are included.  
 # LIBS += /nfs/pfs/prospero.build/sun4/lib/fsu_pthreads/lib/libpthreads.a /nfs/pfs/prospero.build/sun4/lib/malloc/gmalloc.o -lm
-# LIBS_DEPENDENCIES += $(SOURCEBASE)/lib/fsu_pthreads/lib/libpthreads.a $(SOURCEBASE)/lib/malloc/gmalloc.o
+# LIBS_DEPENDENCIES += $(PROSPERO_ROOT)/lib/fsu_pthreads/lib/libpthreads.a $(PROSPERO_ROOT)/lib/malloc/gmalloc.o
 
 ## if running multi-threaded under SOLARIS, add -lthread to LIBS:
 # LIBS += -lthread 
@@ -271,7 +271,7 @@ MORE_SERVER_PROGS =
 #SERVER_DB_LIBS_DEPENDENCIES= $(ARCHIE3_PARCHIE_LIB) $(ARCHIE3_PSARCHIE_LIB) 
 # Unimplemented format to read GOPHER data files; this does not work yet
 # and probably never will since it has been supserseded by the GOPHER-GW.
-#SERVER_DB_LIBS=  $(SOURCEBASE)/lib/psrv/gopher/libpgopher.a
+#SERVER_DB_LIBS=  $(PROSPERO_ROOT)/lib/psrv/gopher/libpgopher.a
 # For just GOPHER-GW
 SERVER_DB_LIBS=  $(GOPHER_GW_LIB) 
 SERVER_DB_LIBS_DEPENDENCIES = $(GOPHER_GW_LIB) 
@@ -437,4 +437,4 @@ INSTALL_EXE_MODE = 755
 INSTALL_DATA_MODE = 644
 
 ###
-include $(SOURCEBASE)/Makefile.boilerplate
+include $(PROSPERO_ROOT)/Makefile.boilerplate
diff --git a/prospero/Makefile.config.sunos-4.1.3 b/prospero/Makefile.config.sunos-4.1.3
index 8897c8c..3f32574 100755
--- a/prospero/Makefile.config.sunos-4.1.3
+++ b/prospero/Makefile.config.sunos-4.1.3
@@ -172,14 +172,14 @@ TOPDIR  = /pfs
 
 P_BINARIES	= $(TOPDIR)/bin
 
-#### SOURCEBASE
+#### PROSPERO_ROOT
 # The directory in which the top-level Prospero makefile exists.  This is the
 # root of the Prospero build directory/source directory you're using.
 # The Prospero Makefiles use this to compute library and include-file 
 # pathnames for the linker and compiler.
 
 # This actually does not need to be defined; each include file defines its own.
-# SOURCEBASE = /nfs/gost/build/10Mar94+19Apr94.patched
+# PROSPERO_ROOT = /nfs/gost/build/10Mar94+19Apr94.patched
 
 #### KERBEROS (K_INC, KRB_LIBS, KRB_LIBS_DEPENDENCIES)
 
@@ -227,7 +227,7 @@ LIBS_DEPENDENCIES=
 ## sure that lib/fsu_pthreads/lib/libpthreads.a and lib/malloc/gmalloc.o
 ## are included.  
 # LIBS += /nfs/pfs/prospero.build/sun4/lib/fsu_pthreads/lib/libpthreads.a /nfs/pfs/prospero.build/sun4/lib/malloc/gmalloc.o -lm
-# LIBS_DEPENDENCIES += $(SOURCEBASE)/lib/fsu_pthreads/lib/libpthreads.a $(SOURCEBASE)/lib/malloc/gmalloc.o
+# LIBS_DEPENDENCIES += $(PROSPERO_ROOT)/lib/fsu_pthreads/lib/libpthreads.a $(PROSPERO_ROOT)/lib/malloc/gmalloc.o
 
 ## if running multi-threaded under SOLARIS, add -lthread to LIBS:
 # LIBS += -lthread 
@@ -272,7 +272,7 @@ MORE_SERVER_PROGS =
 #SERVER_DB_LIBS_DEPENDENCIES= $(ARCHIE3_LIB1) $(ARCHIE3_LIB2) 
 # Unimplemented format to read GOPHER data files; this does not work yet
 # and probably never will since it has been supserseded by the GOPHER-GW.
-#SERVER_DB_LIBS=  $(SOURCEBASE)/lib/psrv/gopher/libpgopher.a
+#SERVER_DB_LIBS=  $(PROSPERO_ROOT)/lib/psrv/gopher/libpgopher.a
 # For just GOPHER-GW
 SERVER_DB_LIBS=  $(GOPHER_GW_LIB) 
 SERVER_DB_LIBS_DEPENDENCIES = $(GOPHER_GW_LIB) 
@@ -437,4 +437,4 @@ INSTALL_EXE_MODE = 755
 INSTALL_DATA_MODE = 644
 
 ###
-include $(SOURCEBASE)/Makefile.boilerplate
+include $(PROSPERO_ROOT)/Makefile.boilerplate
diff --git a/prospero/Makefile.config.sunos-4.1.3_u1 b/prospero/Makefile.config.sunos-4.1.3_u1
index 8c75c5d..c0cf50a 100755
--- a/prospero/Makefile.config.sunos-4.1.3_u1
+++ b/prospero/Makefile.config.sunos-4.1.3_u1
@@ -172,14 +172,14 @@ TOPDIR  = /pfs
 
 P_BINARIES	= $(TOPDIR)/bin
 
-#### SOURCEBASE
+#### PROSPERO_ROOT
 # The directory in which the top-level Prospero makefile exists.  This is the
 # root of the Prospero build directory/source directory you're using.
 # The Prospero Makefiles use this to compute library and include-file 
 # pathnames for the linker and compiler.
 
 # This actually does not need to be defined; each include file defines its own.
-# SOURCEBASE = /nfs/gost/build/10Mar94+19Apr94.patched
+# PROSPERO_ROOT = /nfs/gost/build/10Mar94+19Apr94.patched
 
 #### KERBEROS (K_INC, KRB_LIBS, KRB_LIBS_DEPENDENCIES)
 
@@ -227,7 +227,7 @@ LIBS_DEPENDENCIES=
 ## sure that lib/fsu_pthreads/lib/libpthreads.a and lib/malloc/gmalloc.o
 ## are included.  
 # LIBS += /nfs/pfs/prospero.build/sun4/lib/fsu_pthreads/lib/libpthreads.a /nfs/pfs/prospero.build/sun4/lib/malloc/gmalloc.o -lm
-# LIBS_DEPENDENCIES += $(SOURCEBASE)/lib/fsu_pthreads/lib/libpthreads.a $(SOURCEBASE)/lib/malloc/gmalloc.o
+# LIBS_DEPENDENCIES += $(PROSPERO_ROOT)/lib/fsu_pthreads/lib/libpthreads.a $(PROSPERO_ROOT)/lib/malloc/gmalloc.o
 
 ## if running multi-threaded under SOLARIS, add -lthread to LIBS:
 # LIBS += -lthread 
@@ -272,7 +272,7 @@ MORE_SERVER_PROGS =
 #SERVER_DB_LIBS_DEPENDENCIES= $(ARCHIE3_LIB1) $(ARCHIE3_LIB2) 
 # Unimplemented format to read GOPHER data files; this does not work yet
 # and probably never will since it has been supserseded by the GOPHER-GW.
-#SERVER_DB_LIBS=  $(SOURCEBASE)/lib/psrv/gopher/libpgopher.a
+#SERVER_DB_LIBS=  $(PROSPERO_ROOT)/lib/psrv/gopher/libpgopher.a
 # For just GOPHER-GW
 SERVER_DB_LIBS=  $(GOPHER_GW_LIB) 
 SERVER_DB_LIBS_DEPENDENCIES = $(GOPHER_GW_LIB) 
@@ -437,4 +437,4 @@ INSTALL_EXE_MODE = 755
 INSTALL_DATA_MODE = 644
 
 ###
-include $(SOURCEBASE)/Makefile.boilerplate
+include $(PROSPERO_ROOT)/Makefile.boilerplate
diff --git a/prospero/Makefile.config.sunos-5.3 b/prospero/Makefile.config.sunos-5.3
index f828e97..a8e0796 100755
--- a/prospero/Makefile.config.sunos-5.3
+++ b/prospero/Makefile.config.sunos-5.3
@@ -172,14 +172,14 @@ TOPDIR  = /pfs
 
 P_BINARIES	= $(TOPDIR)/bin
 
-#### SOURCEBASE
+#### PROSPERO_ROOT
 # The directory in which the top-level Prospero makefile exists.  This is the
 # root of the Prospero build directory/source directory you're using.
 # The Prospero Makefiles use this to compute library and include-file 
 # pathnames for the linker and compiler.
 
 # This actually does not need to be defined; each include file defines its own.
-# SOURCEBASE = /nfs/gost/build/10Mar94+19Apr94.patched
+# PROSPERO_ROOT = /nfs/gost/build/10Mar94+19Apr94.patched
 
 #### KERBEROS (K_INC, KRB_LIBS, KRB_LIBS_DEPENDENCIES)
 
@@ -227,7 +227,7 @@ LIBS_DEPENDENCIES=
 ## sure that lib/fsu_pthreads/lib/libpthreads.a and lib/malloc/gmalloc.o
 ## are included.  
 # LIBS += /nfs/pfs/prospero.build/sun4/lib/fsu_pthreads/lib/libpthreads.a /nfs/pfs/prospero.build/sun4/lib/malloc/gmalloc.o -lm
-# LIBS_DEPENDENCIES += $(SOURCEBASE)/lib/fsu_pthreads/lib/libpthreads.a $(SOURCEBASE)/lib/malloc/gmalloc.o
+# LIBS_DEPENDENCIES += $(PROSPERO_ROOT)/lib/fsu_pthreads/lib/libpthreads.a $(PROSPERO_ROOT)/lib/malloc/gmalloc.o
 
 ## if running multi-threaded under SOLARIS, add -lthread to LIBS:
 # LIBS += -lthread 
@@ -272,7 +272,7 @@ MORE_SERVER_PROGS =
 #SERVER_DB_LIBS_DEPENDENCIES= $(ARCHIE3_LIB1) $(ARCHIE3_LIB2) 
 # Unimplemented format to read GOPHER data files; this does not work yet
 # and probably never will since it has been supserseded by the GOPHER-GW.
-#SERVER_DB_LIBS=  $(SOURCEBASE)/lib/psrv/gopher/libpgopher.a
+#SERVER_DB_LIBS=  $(PROSPERO_ROOT)/lib/psrv/gopher/libpgopher.a
 # For just GOPHER-GW
 SERVER_DB_LIBS=  $(GOPHER_GW_LIB) 
 SERVER_DB_LIBS_DEPENDENCIES = $(GOPHER_GW_LIB) 
@@ -437,4 +437,4 @@ INSTALL_EXE_MODE = 755
 INSTALL_DATA_MODE = 644
 
 ###
-include $(SOURCEBASE)/Makefile.boilerplate
+include $(PROSPERO_ROOT)/Makefile.boilerplate
diff --git a/prospero/Makefile.in b/prospero/Makefile.in
index caa8dd0..def6694 100755
--- a/prospero/Makefile.in
+++ b/prospero/Makefile.in
@@ -8,7 +8,6 @@
 # This is the top level Makefile for the Prospero Directory Service.
 
 # Include configuration options.
-SOURCEBASE = .
 include Makefile.config
 
 # Programs that live in subdirectories, and have makefiles of their own.
diff --git a/prospero/app/Makefile.backup.backup b/prospero/app/Makefile.backup.backup
index 6557898..3efa6b8 100755
--- a/prospero/app/Makefile.backup.backup
+++ b/prospero/app/Makefile.backup.backup
@@ -3,8 +3,7 @@
 # app/Makefile.  This makefile will not be invoked by the top-level makefile
 # unless the user wants the PCOMPAT library.
 
-SOURCEBASE=..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 PROGS	= cat ls
 
diff --git a/prospero/app/Makefile.in b/prospero/app/Makefile.in
index e401fdf..9781a19 100755
--- a/prospero/app/Makefile.in
+++ b/prospero/app/Makefile.in
@@ -3,8 +3,7 @@
 # app/Makefile.  This makefile will not be invoked by the top-level makefile
 # unless the user wants the PCOMPAT library.
 
-SOURCEBASE=..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 PROGS	= cat ls
 
diff --git a/prospero/lib/ardp/Makefile.in b/prospero/lib/ardp/Makefile.in
index 3c7c3db..ff1592e 100755
--- a/prospero/lib/ardp/Makefile.in
+++ b/prospero/lib/ardp/Makefile.in
@@ -1,7 +1,6 @@
 # 
 # Makefile for Prospero Directory Service ARDP library. 
-SOURCEBASE = ../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 CFLAGS += -I$(ARCHIE_ROOT)/include
 
diff --git a/prospero/lib/ardp/Makefile.tmp b/prospero/lib/ardp/Makefile.tmp
index 5d66cc9..9a21850 100755
--- a/prospero/lib/ardp/Makefile.tmp
+++ b/prospero/lib/ardp/Makefile.tmp
@@ -1,7 +1,6 @@
 # 
 # Makefile for Prospero Directory Service ARDP library. 
-SOURCEBASE = ../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 CFILES = ardp_abort.c \
 	ardp_accept.c \
diff --git a/prospero/lib/filters/Makefile.in b/prospero/lib/filters/Makefile.in
index 81a789f..dbe2b5a 100755
--- a/prospero/lib/filters/Makefile.in
+++ b/prospero/lib/filters/Makefile.in
@@ -3,8 +3,7 @@
 # where client-side filters are not loadable.
 # This is the default distributed version.
 
-SOURCEBASE=../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 CFILES = \
 	nl_apply_fil.c 
diff --git a/prospero/lib/pcompat/Makefile.in b/prospero/lib/pcompat/Makefile.in
index 9788a72..9421985 100755
--- a/prospero/lib/pcompat/Makefile.in
+++ b/prospero/lib/pcompat/Makefile.in
@@ -1,5 +1,4 @@
-SOURCEBASE = ../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 # There used to be a lib/pcompat/Makefile.pcompat and a separate 
 # lib/pcompat/Makefile.nopcompat.
diff --git a/prospero/lib/pfs/Makefile.in b/prospero/lib/pfs/Makefile.in
index dec8827..877929b 100755
--- a/prospero/lib/pfs/Makefile.in
+++ b/prospero/lib/pfs/Makefile.in
@@ -1,7 +1,6 @@
 # 
 # Makefile for Prospero Directory Service PFS library. 
-SOURCEBASE = ../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 CFILES = \
 	acalloc.c \
@@ -248,7 +247,7 @@ ${PFS_LIB}: ${OBJECTS}
 	$(RANLIB) ${PFS_LIB}
 
 ## This will cuse there to be too many dependencies for TAGS and ETAGS
-## include $(SOURCEBASE)/Makefile.boilerplate
+## include $(PROSPERO_ROOT)/Makefile.boilerplate
 
 # Dependencies
 acalloc.o : ../../include/pmachine.h \
diff --git a/prospero/lib/psrv/Makefile.in b/prospero/lib/psrv/Makefile.in
index bdc64c2..daa56a2 100755
--- a/prospero/lib/psrv/Makefile.in
+++ b/prospero/lib/psrv/Makefile.in
@@ -1,7 +1,6 @@
 # Makefile for LIB/PSRV
 
-SOURCEBASE = ../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 SUBDIRS =
  
diff --git a/prospero/lib/psrv/gopher_gw/Makefile.in b/prospero/lib/psrv/gopher_gw/Makefile.in
index 5681592..8b7dc58 100755
--- a/prospero/lib/psrv/gopher_gw/Makefile.in
+++ b/prospero/lib/psrv/gopher_gw/Makefile.in
@@ -1,5 +1,4 @@
-SOURCEBASE = ../../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 CFILES = \
 	glalloc.c \
diff --git a/prospero/lib/psrv/wais_gw/Makefile.in b/prospero/lib/psrv/wais_gw/Makefile.in
index d3e1688..3956bf7 100755
--- a/prospero/lib/psrv/wais_gw/Makefile.in
+++ b/prospero/lib/psrv/wais_gw/Makefile.in
@@ -12,8 +12,7 @@
 # this file has different configuration ideas from the rest of Prospero.
 # this is a problem.
 
-SOURCEBASE=../../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 # Note that not all versions of make will support this construct.
 CFLAGS += $(WCFLAGS) 
diff --git a/prospero/server/Makefile.in b/prospero/server/Makefile.in
index fd113a4..c7e9b2a 100755
--- a/prospero/server/Makefile.in
+++ b/prospero/server/Makefile.in
@@ -1,5 +1,4 @@
-SOURCEBASE=..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 
 CFILES	= \
diff --git a/prospero/user/Makefile.in b/prospero/user/Makefile.in
index 14f86e7..9aac504 100755
--- a/prospero/user/Makefile.in
+++ b/prospero/user/Makefile.in
@@ -1,5 +1,4 @@
-SOURCEBASE=..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 CFILES	= \
 	p__vfsetup.c \
diff --git a/prospero/user/menu/Makefile.in b/prospero/user/menu/Makefile.in
index 4f480c4..4dff08e 100755
--- a/prospero/user/menu/Makefile.in
+++ b/prospero/user/menu/Makefile.in
@@ -1,5 +1,4 @@
-SOURCEBASE=../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 
 CFILES =  api.c menu.c main.c comp.c bub.c item_desc.c line.c io_util.c objects.c search.c
diff --git a/prospero/user/vcache/Makefile.in b/prospero/user/vcache/Makefile.in
index 2c0c8b5..c79bf80 100755
--- a/prospero/user/vcache/Makefile.in
+++ b/prospero/user/vcache/Makefile.in
@@ -24,8 +24,7 @@
 # The OLD one is no longer in use, but the hooks remain.
 # This should be cleaned up one day.  --swa
 
-SOURCEBASE=../..
-include $(SOURCEBASE)/Makefile.config
+include $(PROSPERO_ROOT)/Makefile.config
 
 LIBOBJECTS    = cmds.o ftp.o pclose.o aftpget.o ruserpass.o gopherget.o vcache.o
 XLIBOBJECTS    = main.o