diff --git a/archie/anonftp/parse/SunOS-5.4/Makefile.in b/archie/anonftp/parse/SunOS-5.4/Makefile.in
index b6f25cb..271dad9 100755
--- a/archie/anonftp/parse/SunOS-5.4/Makefile.in
+++ b/archie/anonftp/parse/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS = -lresolv  -lnsl -lsocket -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS = -lresolv  -lnsl -lsocket -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 
 include ../Makefile.pre
 include ../Makefile.post
diff --git a/archie/anonftp/retrieve/SunOS-5.4/Makefile.in b/archie/anonftp/retrieve/SunOS-5.4/Makefile.in
index b6f25cb..271dad9 100755
--- a/archie/anonftp/retrieve/SunOS-5.4/Makefile.in
+++ b/archie/anonftp/retrieve/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS = -lresolv  -lnsl -lsocket -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS = -lresolv  -lnsl -lsocket -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 
 include ../Makefile.pre
 include ../Makefile.post
diff --git a/archie/anonftp/update/Makefile.pre b/archie/anonftp/update/Makefile.pre
index 64d1032..4df88ec 100755
--- a/archie/anonftp/update/Makefile.pre
+++ b/archie/anonftp/update/Makefile.pre
@@ -23,7 +23,7 @@ MOD_LIBS = \
             -L$(PATRIE_MODULE)/$(SYSTYPE)       -lpatrie     \
             -L$(STARTDB_MODULE)/$(SYSTYPE)      -lstartdb    \
             -L$(WEBINDEX_MODULE)/lib/$(SYSTYPE) -lwebindex   \
-            -ldb
+            -L$(BERKDB_ROOT)/PORT/$(SYSTYPE)    -ldb
 
 
 include $(ARCHIE_ROOT)/Makefile.pre
diff --git a/archie/anonftp/update/SunOS-5.4/Makefile.in b/archie/anonftp/update/SunOS-5.4/Makefile.in
index b6f25cb..271dad9 100755
--- a/archie/anonftp/update/SunOS-5.4/Makefile.in
+++ b/archie/anonftp/update/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS = -lresolv  -lnsl -lsocket -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS = -lresolv  -lnsl -lsocket -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 
 include ../Makefile.pre
 include ../Makefile.post
diff --git a/archie/clients/cgi/SunOS-5.4/Makefile.in b/archie/clients/cgi/SunOS-5.4/Makefile.in
index b2750e5..bc82155 100755
--- a/archie/clients/cgi/SunOS-5.4/Makefile.in
+++ b/archie/clients/cgi/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS = -lnsl -lsocket -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS = -lnsl -lsocket -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 
 include ../Makefile.pre
 RANLIB = :
diff --git a/archie/clients/telnet/SunOS-5.4/Makefile.in b/archie/clients/telnet/SunOS-5.4/Makefile.in
index 11ead16..3b7730f 100644
--- a/archie/clients/telnet/SunOS-5.4/Makefile.in
+++ b/archie/clients/telnet/SunOS-5.4/Makefile.in
@@ -2,7 +2,7 @@
 COMPILER_PREPENDS_C_SYMBOLS_WITH_UNDERSCORE =
 
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__ -DSOLARIS
-SYS_LIBS   = -lnsl -lsocket -ldl -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS   = -lnsl -lsocket -ldl -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
 
 include ../Makefile.pre
diff --git a/archie/control/SunOS-5.4/Makefile.in b/archie/control/SunOS-5.4/Makefile.in
index c2b0e01..4601b7e 100755
--- a/archie/control/SunOS-5.4/Makefile.in
+++ b/archie/control/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS = -lnsl -lsocket -lresolv -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS = -lnsl -lsocket -lresolv -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 
 include ../Makefile.pre
 include ../Makefile.post
diff --git a/archie/exchange/SunOS-5.4/Makefile.in b/archie/exchange/SunOS-5.4/Makefile.in
index fb29494..ff96359 100755
--- a/archie/exchange/SunOS-5.4/Makefile.in
+++ b/archie/exchange/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS = -lresolv -lnsl -lsocket -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS = -lresolv -lnsl -lsocket -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 
 include ../Makefile.pre
 
diff --git a/archie/lib/libparchie/Makefile.pre b/archie/lib/libparchie/Makefile.pre
index 9b8a903..67a0560 100755
--- a/archie/lib/libparchie/Makefile.pre
+++ b/archie/lib/libparchie/Makefile.pre
@@ -11,7 +11,7 @@ MOD_DEBUG  = -g3
 MOD_DEFS   = -DGOPHERINDEX_SUPPORT
 MOD_INCS   = -I$(INCLUDE_MODULE) -I$(PROSPERO_ROOT)/include -I$(STARTDB_MODULE) \
 				   -I$(PATRIE_MODULE) -I$(ARCHSEARCH_MODULE) -I$(STRIDX_MODULE)  \
-           -I$(WEBINDEX_MODULE)/lib -I. -I /archie1/FutureRelease/prospero/SunOS-4.1.4/include
+           -I$(WEBINDEX_MODULE)/lib -I.
 
 #MOD_WARN   = -Wall -Wtraditional -Wshadow -Wpointer-arith -Wcast-align
 MOD_WARN   =
diff --git a/archie/ppc/lib/Makefile.pre b/archie/ppc/lib/Makefile.pre
index c7bc275..fd021eb 100755
--- a/archie/ppc/lib/Makefile.pre
+++ b/archie/ppc/lib/Makefile.pre
@@ -4,7 +4,7 @@
 
 PDIR = $(PROSPERO_ROOT)
 MDIR = $(PDIR)/user/menu
-TDIR = /usr/local/packages/tcl
+TDIR = $(DEST_DIR)
 
 MOD_CFLAGS = -pipe
 MOD_DEBUG  = -g3
diff --git a/archie/ppc/tcl/Makefile.pre b/archie/ppc/tcl/Makefile.pre
index afa29ec..e2cd56a 100755
--- a/archie/ppc/tcl/Makefile.pre
+++ b/archie/ppc/tcl/Makefile.pre
@@ -19,7 +19,7 @@ ARCH_ = $(LIBPARCHIE_MODULE)/$(SYSTYPE)/libparchie.a
 PSAR  = $(LIBPSARCHIE_MODULE)/$(SYSTYPE)/libpsarchie.a
 #SDB   = $(STARTDB_MODULE)/$(SYSTYPE)/libstartdb.a
 #HDB   = $(HOSTDB_MODULE)/$(SYSTYPE)/libhostdb.a
-TCL   = /usr/local/lib/libtcl.a
+TCL   = $(DEST_DIR)/lib/libtcl7.6.a
 
 
 LIBS = \
@@ -38,7 +38,7 @@ LIBS = \
 #MOD_DEFS   = -DDEBUG -DNO_TCL
 MOD_DEBUG  = -g3
 MOD_INCS   = -I$(PPC_MODULE)/lib -I$(PDIR)/include -I$(MDIR) \
-             -I$(ARCHIE_ROOT)/include -I/usr/local/include
+             -I$(ARCHIE_ROOT)/include -I$(DEST_DIR)/include
 MOD_WARN   = -Wall -Wtraditional -Wshadow -Wpointer-arith -Wcast-align \
              -Wnested-externs
 MOD_LIBS   = $(LIBS)
diff --git a/archie/tools/SunOS-5.4/Makefile.in b/archie/tools/SunOS-5.4/Makefile.in
index 5e86cbb..5fd2521 100755
--- a/archie/tools/SunOS-5.4/Makefile.in
+++ b/archie/tools/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS_0 = -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS_0 = -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 SYS_LIBS_1 = -lresolv -lnsl -lsocket -lmp 
 SYS_LIBS = ${SYS_LIBS_0} ${SYS_LIBS_1}
 
diff --git a/archie/webindex/parse/SunOS-5.4/Makefile.in b/archie/webindex/parse/SunOS-5.4/Makefile.in
index b6f25cb..271dad9 100755
--- a/archie/webindex/parse/SunOS-5.4/Makefile.in
+++ b/archie/webindex/parse/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS = -lresolv  -lnsl -lsocket -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS = -lresolv  -lnsl -lsocket -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 
 include ../Makefile.pre
 include ../Makefile.post
diff --git a/archie/webindex/retrieve/SunOS-5.4/Makefile.in b/archie/webindex/retrieve/SunOS-5.4/Makefile.in
index f44dbee..a3e1644 100755
--- a/archie/webindex/retrieve/SunOS-5.4/Makefile.in
+++ b/archie/webindex/retrieve/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS = -lnsl -lsocket -lresolv  -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS = -lnsl -lsocket -lresolv  -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 
 include ../Makefile.pre
 include ../Makefile.post
diff --git a/archie/webindex/tools/SunOS-5.4/Makefile.in b/archie/webindex/tools/SunOS-5.4/Makefile.in
index 3121ce9..7d50240 100755
--- a/archie/webindex/tools/SunOS-5.4/Makefile.in
+++ b/archie/webindex/tools/SunOS-5.4/Makefile.in
@@ -4,7 +4,7 @@
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
 SYS_LIBS_0 = -lresolv -lnsl -lsocket 
-SYS_LIBS_1 = -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS_1 = -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 SYS_LIBS = ${SYS_LIBS_0} ${SYS_LIBS_1}
 
 include ../Makefile.pre
diff --git a/archie/webindex/update/SunOS-5.4/Makefile.in b/archie/webindex/update/SunOS-5.4/Makefile.in
index c58417b..8a8221a 100755
--- a/archie/webindex/update/SunOS-5.4/Makefile.in
+++ b/archie/webindex/update/SunOS-5.4/Makefile.in
@@ -3,7 +3,7 @@
 #
 SYS_DEFS   = -D__USE_FIXED_PROTOTYPES__  -DSOLARIS
 SENT_FLAGS = -ffixed-%g2 -ffixed-%g3 -ffixed-%g4
-SYS_LIBS = -lresolv -lnsl -lsocket -L${BERKDB_ROOT}/${SYSTYPE} -ldb
+SYS_LIBS = -lresolv -lnsl -lsocket -L${BERKDB_ROOT}/PORT/${SYSTYPE} -ldb
 
 include ../Makefile.pre
 include ../Makefile.post