convert-all-makefiles-to-makefile-ins-20010802

all relevant variables become subst'd and not passed in the environment
2025-01-18 06:50:12 +00:00 · 2001-08-02 16:45:35 +00:00 · 2001-08-02 16:45:35 +00:00 · 0207991adc
commit 0207991adc
parent c6d388fe14
149 changed files with 861 additions and 319 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -6,8 +6,9 @@
 # directory or online at http://www.openafs.org/dl/license10.html

 SHELL=/bin/sh
-DESTDIR=dest/
-SRCDIR=${DESTDIR}
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
 INSTALL=${SRCDIR}bin/install

 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
@ -30,27 +31,29 @@ WITH_INSECURE=@WITH_INSECURE@

 ENABLE_KERNEL_MODULE=@ENABLE_KERNEL_MODULE@

-# To compile AFS from scratch in the src tree run "make SYS_NAME=<type>".
+# To compile AFS from scratch in the src tree run "make".
 #   This recursively calls "make install ..." and does not depend on the
 #   existence of any non-standard programs.
-# To compile a package and all its predecessors using washtool run
-#   "make <package>".  This requires that @sys works, and that washtool,
-#   rcsupdate and our version of ci and co exist.
-# To compile for the kernel type "make blibafs".  This assumes washtool,
-#   install, rxgen, compile_et and others already exist and runs it with
+# To compile for the kernel type "make blibafs".  This assumes install, 
+#   rxgen, compile_et and others already exist and runs it with
 #   "-argument kinstall".

+COMPILE_PART1=cd src; cd
+COMPILE_PART2=; $(MAKE) install
+COMPILE_PART3=; $(MAKE) test
+COMPILE_CLEAN=; $(MAKE) clean
+
 all: force
 	set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
-	$(MAKE) install "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME}
+	$(MAKE) install

 all_nolibafs:
 	set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
-	$(MAKE) install TARGET=finale_nolibafs "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME}
+	$(MAKE) install TARGET=finale_nolibafs

 only_libafs:
 	set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
-	$(MAKE) install TARGET=libafs "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME}
+	$(MAKE) install TARGET=libafs

 project: cmd comerr 

@ -375,12 +378,7 @@ libadmin_real:
 libadmin: libafsauthent bozo
 	case ${SYS_NAME} in \
 	alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \
-			$(MAKE) libadmin_real SYS_NAME=$(SYS_NAME) \
-			COMPILE_PART1="$(COMPILE_PART1)" \
-			COMPILE_PART2="$(COMPILE_PART2)" \
-			TOP_SRCDIR=@TOP_SRCDIR@ \
-			SRCDIR=$(SRCDIR) DESTDIR=$(DESTDIR) \
-			DBG_DEFS=$(DBG_DEFS) ;; \
+			$(MAKE) libadmin_real ;; \
 	*) \
 		echo Not building MT libadmin for ${SYS_NAME} ;; \
 	esac
@ -409,27 +407,21 @@ force:

 TARGET=finale
 install: force
-	$(MAKE) $(TARGET) "SYS_NAME=${SYS_NAME}" \
-		"COMPILE_PART1=${COMPILE_PART1}" \
-		"COMPILE_PART2=${COMPILE_PART2}" \
-		 DESTDIR=`pwd`/${SYS_NAME}/dest/ \
-		 TOP_SRCDIR=@TOP_SRCDIR@ \
-		 SRCDIR=`pwd`/${SYS_NAME}/dest/ \
-		 "DBG_DEFS=${DBG_DEFS}"
+	$(MAKE) $(TARGET)

 kupdate: updatekdir libafs_setup libuafs_setup

 blibafs:
-	$(MAKE) libafs "WASHTOOL=${WASHTOOL}" "WASHTOOLFLAGS=-argument kinstall" SYS_NAME=${SYS_NAME} "CPUARCH=${CPUARCH}" "MPSP=${MPSP}" "DBG_DEFS=${DBG_DEFS}"
+	$(MAKE) libafs

 blibuafs:
-	$(MAKE) libuafs "WASHTOOL=${WASHTOOL}" "WASHTOOLFLAGS=-argument ukinstall" SYS_NAME=${SYS_NAME} "CPUARCH=${CPUARCH}" "MPSP=${MPSP}" "DBG_DEFS=${DBG_DEFS}"
+	$(MAKE) libuafs

 bwebafs: sys
-	$(MAKE) libuafs "WASHTOOL=${WASHTOOL}" "WASHTOOLFLAGS=-argument webinstall" SYS_NAME=${SYS_NAME} "CPUARCH=${CPUARCH}" "MPSP=${MPSP}" "DBG_DEFS=${DBG_DEFS}"
+	$(MAKE) libuafs

 clean:
-	$(MAKE) clean2 "COMPILE_PART1=cd src; cd" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME} 
+	$(MAKE) clean2

 clean2:
 	-${COMPILE_PART1} config ${COMPILE_CLEAN}
@ -524,24 +516,6 @@ distclean: clean
 pristine: distclean
 	/bin/rm -f src/config/afsconfig.h.in configure aclocal.m4

-links:
-	echo "Remove the obj directory"
-	- /bin/rm -rf @sys/obj/* ;
-	- /bin/rm -rf @sys/dest/* ;
-	- /bin/mkdir @sys/obj ;
-	echo "Create the obj directories"
-	here=`pwd` ; \
-	cd src; \
-	for file in `find [!NW]* -type d -print` ; do \
-		/bin/mkdir $${here}/obj/$${file} ; \
-	done;
-	echo "Create the obj file links"
-	here=`pwd` ; \
-	cd src; \
-	for file in `find [!NW]* -type f -print` ; do \
-		/bin/ln -s `pwd`/$${file} $${here}/obj/$${file} ; \
-	done;
-
 #
 # Below targets are all deprecated, insecure, or obsolte, 
 # see README.OBSOLETE and README.INSECURE for more info
--- a/configure.in
+++ b/configure.in
@ -354,6 +354,8 @@ fi

 SRCDIR_PARENT=`pwd`
 TOP_SRCDIR="${SRCDIR_PARENT}/src"
+DESTDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/"
+SRCDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/"

 dnl checks for header files.
 AC_HEADER_STDC
@ -379,6 +381,8 @@ AC_SUBST(LINUX_KERNEL_PATH)
 AC_SUBST(LINUX_VERSION)
 AC_SUBST(MKAFS_OSTYPE)
 AC_SUBST(TOP_SRCDIR)
+AC_SUBST(DESTDIR)
+AC_SUBST(SRCDIR)
 AC_SUBST(WITH_OBSOLETE)
 AC_SUBST(WITH_INSECURE)

@ -387,6 +391,109 @@ Makefile               \
 src/config/Makefile.version-NOCML \
 src/config/Makefile.${AFS_SYSNAME} \
 src/libafs/MakefileProto.${MKAFS_OSTYPE} \
+src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
 src/pam/Makefile \
 src/afsd/afs.ppc_darwin.plist \
+src/afs/Makefile \
+src/afsd/Makefile \
+src/afsmonitor/Makefile \
+src/afsweb/Makefile \
+src/audit/Makefile \
+src/auth/test/Makefile \
+src/auth/Makefile \
+src/bozo/test/Makefile \
+src/bozo/Makefile \
+src/bu_utils/Makefile \
+src/bubasics/Makefile \
+src/bucoord/Makefile \
+src/budb/Makefile \
+src/butc/Makefile \
+src/butm/Makefile \
+src/cmd/test/Makefile \
+src/cmd/Makefile \
+src/comerr/test/Makefile \
+src/comerr/Makefile \
+src/config/Makefile \
+src/dauth/Makefile \
+src/des/test/Makefile \
+src/des/Makefile \
+src/des_stub/Makefile \
+src/dir/test/Makefile \
+src/dir/Makefile \
+src/export/Makefile \
+src/finale/Makefile \
+src/fsint/Makefile \
+src/fsprobe/Makefile \
+src/ftpd43+/Makefile \
+src/gtx/Makefile \
+src/inetd/Makefile \
+src/kauth/test/Makefile \
+src/kauth/Makefile \
+src/libacl/test/Makefile \
+src/libacl/Makefile \
+src/libadmin/adminutil/Makefile \
+src/libadmin/Makefile \
+src/libadmin/bos/Makefile \
+src/libadmin/cfg/test/Makefile \
+src/libadmin/cfg/Makefile \
+src/libadmin/client/Makefile \
+src/libadmin/kas/Makefile \
+src/libadmin/pts/Makefile \
+src/libadmin/samples/Makefile \
+src/libadmin/test/Makefile \
+src/libadmin/vos/Makefile \
+src/libafsauthent/Makefile \
+src/libafsrpc/Makefile \
+src/log/test/Makefile \
+src/log/Makefile \
+src/login/Makefile \
+src/lwp/test/Makefile \
+src/lwp/Makefile \
+src/mpp/Makefile \
+src/ntp/Makefile \
+src/null/Makefile \
+src/package/Makefile \
+src/pam/Makefile \
+src/pinstall/test/Makefile \
+src/pinstall/Makefile \
+src/procmgmt/Makefile \
+src/procmgmt/test/Makefile \
+src/ptserver/Makefile \
+src/rcp/Makefile \
+src/rlogind/Makefile \
+src/rsh/Makefile \
+src/rx/Makefile \
+src/rx/bulk.example/Makefile \
+src/rx/bulktest/Makefile \
+src/rx/multi.example/Makefile \
+src/rx/simple.example/Makefile \
+src/rx/test/Makefile \
+src/rxgen/Makefile \
+src/rxkad/Makefile \
+src/rxkad/test/Makefile \
+src/rxstat/Makefile \
+src/scout/Makefile \
+src/sgistuff/Makefile \
+src/sia/Makefile \
+src/sys/Makefile \
+src/tbutc/Makefile \
+src/tsm41/Makefile \
+src/tviced/Makefile \
+src/ubik/Makefile \
+src/update/Makefile \
+src/usd/test/Makefile \
+src/usd/Makefile \
+src/uss/Makefile \
+src/util/Makefile \
+src/util/test/Makefile \
+src/venus/test/Makefile \
+src/venus/Makefile \
+src/vfsck/Makefile \
+src/viced/Makefile \
+src/vlserver/Makefile \
+src/vol/Makefile \
+src/vol/test/Makefile \
+src/volser/Makefile \
+src/wsadmin.src/Makefile \
+src/xstat/Makefile \
 )
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@ -5,13 +5,18 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL=/bin/sh
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/

 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1

-COMPONENT=afs
+
 include ../config/Makefile.${SYS_NAME}
 include ../config/Makefile.version

--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@ -6,14 +6,16 @@
 # directory or online at http://www.openafs.org/dl/license10.html

 # afsd makefile
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

 SHELL = /bin/sh
-DESTDIR = DEST/
-SRCDIR = DEST/

 SOURCES = afsd.c sys.c

-COMPONENT=afsd
+
 include ../config/Makefile.${SYS_NAME}
 include ../config/Makefile.version

--- a/src/afsmonitor/Makefile.in
+++ b/src/afsmonitor/Makefile.in
@ -6,11 +6,15 @@
 # directory or online at http://www.openafs.org/dl/license10.html

 # Makefile for Afsmonitor, the AFS Performance monitoring tool
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

 SHELL = /bin/sh
-DESTDIR=DEST/
-SRCDIR=DEST/
-COMPONENT=afsmonitor
+
+
+
 include ../config/Makefile.${SYS_NAME}

 CFLAGS=-g -I. \
--- a/src/afsweb/Makefile.in
+++ b/src/afsweb/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL=/bin/sh
-COMPONENT=nsafs
+

 include ../config/Makefile.${SYS_NAME}

--- a/src/audit/Makefile.in
+++ b/src/audit/Makefile.in
@ -12,9 +12,14 @@
 # # supported (if not supported, don't show it).
 # ######################################################################

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh

-COMPONENT=audit
+
 include ../config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1

--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=auth
+

 include ../config/Makefile.${SYS_NAME}

--- a/src/auth/test/Makefile.in
+++ b/src/auth/test/Makefile.in
@ -5,16 +5,20 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../../config/Makefile.${SYS_NAME}

 SRCDIR=
-DESTDIR=DEST/
+
 OPTIMIZE=-O

 INCDIRS= -I./ -I${DESTDIR}include
 LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L${DESTDIR}lib/rx
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= -lauth -lsys -lrx -llwp ${utilib} ${XLIBS}
+LIBS= -lauth -lsys -lrx -llwp -lafsutil ${XLIBS}

 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS}

--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL=/bin/sh
-COMPONENT=bozo
+
 include ../config/Makefile.${SYS_NAME}

 COMPILE_ET=$(SRCDIR)bin/compile_et
--- a/src/bozo/test/Makefile.in
+++ b/src/bozo/test/Makefile.in
@ -5,14 +5,18 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SRCDIR=
-DESTDIR=DEST/
+
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O

 INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
 LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a

 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}

--- a/src/bu_utils/Makefile.in
+++ b/src/bu_utils/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=bu_utils
+
 include ../config/Makefile.${SYS_NAME}

 COMPILE_ET = ${DESTDIR}/bin/compile_et
--- a/src/bubasics/Makefile.in
+++ b/src/bubasics/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=bubasics
+
 include ../config/Makefile.${SYS_NAME}

 RXGEN=${SRCDIR}bin/rxgen
--- a/src/bucoord/Makefile.in
+++ b/src/bucoord/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=bucoord
+
 include ../config/Makefile.${SYS_NAME}

 COMPILE_ET = ${SRCDIR}bin/compile_et
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@ -7,9 +7,13 @@

 # */

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

 SHELL = /bin/sh
-COMPONENT=budb
+
 include ../config/Makefile.${SYS_NAME}

 COMPILE_ET = ${SRCDIR}bin/compile_et
@ -31,31 +35,22 @@ INCLS= \
 	${SRCDIR}include/afs/bubasics.h \
 	budb.h budb_client.h database.h

-audlib=${SRCDIR}lib/afs/libaudit.a
-deslib=${SRCDIR}lib/libdes.a
-rxkadlib=${SRCDIR}lib/librxkad.a
-kauthlib=${SRCDIR}lib/afs/libkauth.a
-authlib=${SRCDIR}lib/afs/libauth.a
-cmdlib=${SRCDIR}lib/afs/libcmd.a
-utilib=${SRCDIR}lib/afs/util.a
-ubiklib=${SRCDIR}lib/libubik.a
-
 # library ordering defined by top level makefile
-
 LIBS= ${SRCDIR}lib/afs/libbubasics.a \
-	${audlib}                    \
-        ${SRCDIR}lib/afs/libprot.a      \
-        ${kauthlib} \
-        ${ubiklib} \
-        ${authlib} \
-        ${rxkadlib} \
-        ${SRCDIR}lib/afs/libsys.a \
-        ${deslib} \
-        ${SRCDIR}lib/librx.a \
-        ${SRCDIR}lib/afs/libsys.a \
-        ${SRCDIR}lib/liblwp.a \
-        ${cmdlib} ${SRCDIR}lib/afs/libcom_err.a \
-        ${utilib} 
+	${SRCDIR}lib/afs/libaudit.a \
+	${SRCDIR}lib/afs/libprot.a \
+	${SRCDIR}lib/afs/libkauth.a \
+	${SRCDIR}lib/libubik.a \
+	${SRCDIR}lib/afs/libauth.a \
+	${SRCDIR}lib/librxkad.a \
+	${SRCDIR}lib/afs/libsys.a \
+	${SRCDIR}lib/libdes.a \
+	${SRCDIR}lib/librx.a \
+	${SRCDIR}lib/afs/libsys.a \
+	${SRCDIR}lib/liblwp.a \
+	${SRCDIR}lib/afs/libcmd.a \
+	${SRCDIR}lib/afs/libcom_err.a \
+	${SRCDIR}lib/afs/util.a

 COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o \
 	ol_verify.o
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=butc
+
 include ../config/Makefile.${SYS_NAME}

 CFLAGS=-g -w ${INCDIRS} ${XCFLAGS}
--- a/src/butm/Makefile.in
+++ b/src/butm/Makefile.in
@ -7,9 +7,12 @@

 # */

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-SRCDIR=DEST/
-DESTDIR=DEST/

 CFLAGS = -g -w -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
@ -22,7 +25,7 @@ ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${XLIBS}

 OBJS=file_tm.o 

-COMPONENT=butm
+
 include ../config/Makefile.${SYS_NAME}
 include ../config/Makefile.version

--- a/src/cmd/Makefile.in
+++ b/src/cmd/Makefile.in
@ -6,9 +6,13 @@
 # directory or online at http://www.openafs.org/dl/license10.html

 # */
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

 SHELL = /bin/sh
-COMPONENT=cmd
+
 include ../config/Makefile.${SYS_NAME}

 COMPILE_ET = ${SRCDIR}bin/compile_et
--- a/src/cmd/test/Makefile.in
+++ b/src/cmd/test/Makefile.in
@ -5,14 +5,19 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-DESTDIR=DEST/
-SRCDIR=DEST/
+
+
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O

 LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. L${BACKDIR}lib -L${BACKDIR}lib/afs
-LIBS=-lcmd -lcom_err ${DESTDIR}lib/afs/util.a
+LIBS=-lcmd -lcom_err -lafsutil

 INCDIRS=  -I${SRCDIR}include -I${SRCDIR}include/afs -I.. -I${BACKDIR}include -I${BACKDIR}include/afs

--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@ -7,8 +7,13 @@
 #	$Locker$
 #

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=comerr
+
 include ../config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1

@ -31,10 +36,8 @@ CFILES=	compile_et.c error_table.c error_msg.c et_name.c \

 UKSRCS=com_err.c com_err.h error_msg.c error_table.h mit-sipb-cr.h internal.h et_name.c

-COMPONENT=comerr
-include ../config/Makefile.version

-utilib=${SRCDIR}lib/afs/util.a ${XLIBS}
+include ../config/Makefile.version

 system noversion: install

@ -86,9 +89,9 @@ doc:	com_err.dvi
 compile_et:	compile_et.o error_table.o
 	case $(SYS_NAME) in \
 	*_linux* ) \
-	${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o ${utilib};; \
+	${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil;; \
 	* ) \
-	${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o ${utilib} -ll;; \
+	${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil -ll;; \
 	esac

 et.tar:	${FILES}
--- a/src/comerr/test/Makefile.in
+++ b/src/comerr/test/Makefile.in
@ -1,12 +1,15 @@
+TOP_SRCDIR=@DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+

-SRCDIR=DEST/
-DESTDIR=DEST/
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O

 INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
 LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a
 LIBS= -lcom_err

 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
--- a/src/config/Makefile.alpha_dux40.in
+++ b/src/config/Makefile.alpha_dux40.in
@ -21,7 +21,6 @@ OPTMZ=-O2
 DBG=-g3
 CSTATIC=-non_shared
 RANLIB=/bin/true
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 CP=cp

--- a/src/config/Makefile.alpha_dux50.in
+++ b/src/config/Makefile.alpha_dux50.in
@ -22,7 +22,6 @@ DBG=-g3
 CP=cp
 CSTATIC=-non_shared
 RANLIB=/bin/true
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install

 #this is for the vol package
--- a/src/config/Makefile.alpha_linux_22.in
+++ b/src/config/Makefile.alpha_linux_22.in
@ -38,7 +38,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
--- a/src/config/Makefile.hp_ux102.in
+++ b/src/config/Makefile.hp_ux102.in
@ -21,7 +21,6 @@ LWP_OPTMZ=-O
 OPTMZ=-O
 DBG=-g
 RANLIB=ranlib
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 RM=/bin/rm
 CP=/bin/cp
--- a/src/config/Makefile.hp_ux110.in
+++ b/src/config/Makefile.hp_ux110.in
@ -21,7 +21,6 @@ LWP_OPTMZ=-O
 OPTMZ=-O
 DBG=-g
 RANLIB=ranlib
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 RM=/bin/rm
 CP=/bin/cp
--- a/src/config/Makefile.i386_djgpp
+++ b/src/config/Makefile.i386_djgpp
@ -9,8 +9,6 @@
 #
 # AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
 AFS_OSTYPE = DJGPP
-DESTDIR=DEST/
-SRCDIR=DEST/

 # compilation and link editor flags
 #DBG=-g
@ -40,7 +38,6 @@ RANLIB=dos-ranlib
 MT_CC=dos-gcc -bmmap
 MV=mv
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
--- a/src/config/Makefile.i386_fbsd_42.in
+++ b/src/config/Makefile.i386_fbsd_42.in
@ -4,9 +4,6 @@
 #
 # AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
 AFS_OSTYPE = FBSD
-# Pointers to destination and source directories
-DESTDIR=DEST/
-SRCDIR=DEST/
 # Base directory for linux kernel source. Actually a prefix which is complete
 # when LINUX_VERS is appended to it.
 # LINUX_SRCDIR = /usr/src/linux-
@ -43,7 +40,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
--- a/src/config/Makefile.i386_linux22.in
+++ b/src/config/Makefile.i386_linux22.in
@ -44,7 +44,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
--- a/src/config/Makefile.i386_linux24.in
+++ b/src/config/Makefile.i386_linux24.in
@ -35,7 +35,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@ -5,10 +5,15 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 KERNELDIR=../libafs
 UKERNELDIR=../libuafs
 SHELL=/bin/sh
-COMPONENT=config
+
 include Makefile.${SYS_NAME}

 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
--- a/src/config/Makefile.ppc_darwin_12.in
+++ b/src/config/Makefile.ppc_darwin_12.in
@ -3,9 +3,6 @@
 # AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
 AFS_OSTYPE = DARWIN
 #
-# Pointers to destination and source directories
-DESTDIR=DEST/
-DESTDIR=DEST/
 #
 # compilation and link editor flags
 XCFLAGS=-traditional-cpp
--- a/src/config/Makefile.ppc_darwin_13.in
+++ b/src/config/Makefile.ppc_darwin_13.in
@ -3,9 +3,6 @@
 # AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
 AFS_OSTYPE = DARWIN
 #
-# Pointers to destination and source directories
-DESTDIR=DEST/
-DESTDIR=DEST/
 #
 # compilation and link editor flags
 XCFLAGS=-traditional-cpp
--- a/src/config/Makefile.ppc_linux22.in
+++ b/src/config/Makefile.ppc_linux22.in
@ -36,7 +36,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${SRCDIR}bin/washtool
 #
 # Other OS specific requirements
 #
--- a/src/config/Makefile.ppc_linux24.in
+++ b/src/config/Makefile.ppc_linux24.in
@ -35,7 +35,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
+
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
--- a/src/config/Makefile.rs_aix42.in
+++ b/src/config/Makefile.rs_aix42.in
@ -34,7 +34,6 @@ LEX=lex
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # This is the XBSA make flag and pathname to XBSA header files (xbsa.h)
--- a/src/config/Makefile.s390_linux22.in
+++ b/src/config/Makefile.s390_linux22.in
@ -40,7 +40,6 @@ MT_CC=gcc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
--- a/src/config/Makefile.s390_linux24.in
+++ b/src/config/Makefile.s390_linux24.in
@ -40,7 +40,6 @@ MT_CC=gcc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
--- a/src/config/Makefile.sgi_62.in
+++ b/src/config/Makefile.sgi_62.in
@ -38,7 +38,6 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # This is for the vol package
--- a/src/config/Makefile.sgi_63.in
+++ b/src/config/Makefile.sgi_63.in
@ -38,5 +38,4 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
--- a/src/config/Makefile.sgi_64.in
+++ b/src/config/Makefile.sgi_64.in
@ -39,7 +39,6 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # This is for the vol package
--- a/src/config/Makefile.sgi_65.in
+++ b/src/config/Makefile.sgi_65.in
@ -39,7 +39,6 @@ LEX=lex
 MV=mv
 RANLIB=/bin/true
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # This is for the vol package
--- a/src/config/Makefile.sparc64_linux22.in
+++ b/src/config/Makefile.sparc64_linux22.in
@ -39,7 +39,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
--- a/src/config/Makefile.sparc64_linux24.in
+++ b/src/config/Makefile.sparc64_linux24.in
@ -39,7 +39,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
--- a/src/config/Makefile.sparc_linux22.in
+++ b/src/config/Makefile.sparc_linux22.in
@ -39,7 +39,6 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # Other OS specific requirements
--- a/src/config/Makefile.sun4x_55.in
+++ b/src/config/Makefile.sun4x_55.in
@ -39,7 +39,6 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # this is for the vol package
--- a/src/config/Makefile.sun4x_56.in
+++ b/src/config/Makefile.sun4x_56.in
@ -43,7 +43,6 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # this is for the vol package
--- a/src/config/Makefile.sun4x_57.in
+++ b/src/config/Makefile.sun4x_57.in
@ -47,7 +47,6 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # this is for the vol package
--- a/src/config/Makefile.sun4x_58.in
+++ b/src/config/Makefile.sun4x_58.in
@ -40,7 +40,6 @@ MV=mv
 RANLIB=/bin/true
 RM=rm
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
 #
 # this is for the vol package
--- a/src/config/Makefile.sunx86_54.in
+++ b/src/config/Makefile.sunx86_54.in
@ -20,5 +20,4 @@ AR = /usr/ccs/bin/ar
 LD = /usr/ccs/bin/ld
 LORDER = /usr/ccs/bin/lorder
 STRIP= /usr/ccs/bin/strip
-WASHTOOL=${DESTDIR}bin/washtool
 INSTALL=${DESTDIR}bin/install
--- a/src/dauth/Makefile.in
+++ b/src/dauth/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = 	/bin/sh
-COMPONENT=	dauth
+
 include ../config/Makefile.${SYS_NAME}

 COMPILE_ET = 	${SRCDIR}bin/compile_et
--- a/src/des/Makefile.in
+++ b/src/des/Makefile.in
@ -22,6 +22,11 @@
 # target machine for run-time code (may cross-compile),
 # override as needed 

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}

@ -153,7 +158,7 @@ TARGOBJS = \
 	${CRYPT_OBJ} \
 	util.o

-COMPONENT=des
+
 include ../config/Makefile.version

 # This is required to get compiler flags, but not use CFLAGS.
--- a/src/des/test/Makefile.in
+++ b/src/des/test/Makefile.in
@ -1,6 +1,11 @@

-SRCDIR=DEST/
-DESTDIR=DEST/
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 CC	= cc
@ -12,7 +17,6 @@ PROGS 	= \

 INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
 LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a
 LIBS= -ldes

 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
--- a/src/des_stub/Makefile.in
+++ b/src/des_stub/Makefile.in
@ -8,6 +8,10 @@
 # Install the des libraries and header files from the 
 # PARENT link instead of building them.
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

 SHELL  = /bin/sh
 include ../config/Makefile.${SYS_NAME}
--- a/src/dir/Makefile.in
+++ b/src/dir/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=dir
+
 include ../config/Makefile.${SYS_NAME}

 KERNELDIR = ../libafs/
--- a/src/dir/test/Makefile.in
+++ b/src/dir/test/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=dtest
+
 include ../../config/Makefile.${SYS_NAME}

 KERNELDIR = ../libafs/
--- a/src/export/Makefile.in
+++ b/src/export/Makefile.in
@ -9,8 +9,12 @@
 #
 # Makefile for EXPORT kernel extension, and friends
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+

-COMPONENT=export
 include ../config/Makefile.${SYS_NAME}

 KERNELDIR = ../libafs/
--- a/src/finale/Makefile.in
+++ b/src/finale/Makefile.in
@ -7,6 +7,10 @@

 # */

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

 SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
@ -28,17 +32,23 @@ INCLS=${SRCDIR}include/ubik.h \
 	${SRCDIR}include/afs/bnode.h \
 	${SRCDIR}include/afs/vlserver.h

-rxkadlib=${SRCDIR}lib/librxkad.a
-authlib=${SRCDIR}lib/afs/libauth.a
-cmdlib=${SRCDIR}lib/afs/libcmd.a
-vllib=${SRCDIR}lib/afs/libvldb.a
-boslib=${SRCDIR}lib/afs/libbos.a
-volserlib=${SRCDIR}lib/afs/libvolser.a
-utilib=${SRCDIR}lib/afs/util.a
+LIBS=${SRCDIR}lib/libubik.a \
+	${SRCDIR}lib/librx.a \
+	${SRCDIR}lib/liblwp.a \
+	${SRCDIR}lib/afs/libauth.a \
+	${SRCDIR}lib/afs/libsys.a \
+	${SRCDIR}lib/librxkad.a \
+	${SRCDIR}lib/afs/libcmd.a \
+	${SRCDIR}lib/afs/libvldb.a \
+	${SRCDIR}lib/afs/libbos.a \
+	${SRCDIR}lib/afs/libcom_err.a \
+	${SRCDIR}lib/afs/libvolser.a \
+	${SRCDIR}lib/afs/util.a \
+	${SRCDIR}lib/afs/libkauth.a \
+	${SRCDIR}lib/afs/libprot.a \
+	${SRCDIR}lib/libdes.a \
+	${XLIBS}

-LIBS=${SRCDIR}lib/libubik.a ${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a ${authlib} ${SRCDIR}lib/afs/libsys.a ${deslib} ${rxkadlib} ${cmdlib} ${vllib} ${boslib} ${SRCDIR}lib/afs/libcom_err.a ${volserlib} ${utilib} ${SRCDIR}lib/afs/libkauth.a ${SRCDIR}lib/afs/libprot.a ${SRCDIR}lib/libdes.a ${XLIBS}
-
-COMPONENT=finale
 include ../config/Makefile.version

 all:  translate_et
--- a/src/fsint/Makefile.in
+++ b/src/fsint/Makefile.in
@ -5,7 +5,12 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

-COMPONENT=fsint
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
 include ../config/Makefile.${SYS_NAME}
 SHELL = /bin/sh
 KERNELDIR = ../libafs/
--- a/src/fsprobe/Makefile.in
+++ b/src/fsprobe/Makefile.in
@ -8,8 +8,13 @@
 # Makefile for fsprobe and its test program, all part of the AFS
 # navigation and monitoring tool (gator).
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=fsprobe
+
 include ../config/Makefile.${SYS_NAME}

 CFLAGS=-g -I. \
--- a/src/ftpd43+/Makefile.in
+++ b/src/ftpd43+/Makefile.in
@ -16,8 +16,12 @@
 #
 #	@(#)Makefile	5.8 (Berkeley) 9/22/88

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+

-COMPONENT=ftpd43+
 include ../config/Makefile.version
 include ../config/Makefile.${SYS_NAME}

--- a/src/gtx/Makefile.in
+++ b/src/gtx/Makefile.in
@ -7,9 +7,13 @@

 # Makefile for gtx, a display-independent, object-oriented window toolkit.

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

 SHELL=/bin/sh
-COMPONENT=gtx
+
 include ../config/Makefile.${SYS_NAME}

 COMPILE_ET=$(SRCDIR)bin/compile_et
--- a/src/inetd/Makefile.in
+++ b/src/inetd/Makefile.in
@ -1,5 +1,11 @@
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL=/bin/sh
-COMPONENT=inetd
+
 include ../config/Makefile.${SYS_NAME}

 INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@ -6,10 +6,13 @@
 # directory or online at http://www.openafs.org/dl/license10.html

 # */
-
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

 SHELL = /bin/sh
-COMPONENT=kauth
+
 include ../config/Makefile.${SYS_NAME}

 UKERNELDIR = ../libuafs/
@ -26,36 +29,37 @@ INCLS=${SRCDIR}include/ubik.h \
 	     ${SRCDIR}include/rx/rxkad.h \
 	     ${SRCDIR}include/afs/com_err.h \
 	kaserver.h kauth.h kautils.h 
-deslib=${SRCDIR}lib/libdes.a
-rxkadlib=${SRCDIR}lib/librxkad.a
-authlib=${SRCDIR}lib/afs/libauth.a
-cmdlib=${SRCDIR}lib/afs/libcmd.a
-utilib=${SRCDIR}lib/afs/util.a
-auditlib=${SRCDIR}lib/afs/libaudit.a

 LIBS =	${SRCDIR}lib/libubik.a \
 	${SRCDIR}lib/afs/libprot.a \
-	${authlib} \
-	${rxkadlib} \
+	${SRCDIR}lib/afs/libauth.a \
+	${SRCDIR}lib/librxkad.a \
 	${SRCDIR}lib/afs/libsys.a \
 	${SRCDIR}lib/librxstat.a \
 	${SRCDIR}lib/librx.a \
 	${SRCDIR}lib/afs/libsys.a  \
 	${SRCDIR}lib/liblwp.a \
-	${deslib} \
-	${cmdlib} \
+	${SRCDIR}lib/libdes.a \
+	${SRCDIR}lib/afs/libcmd.a \
 	${SRCDIR}lib/afs/libcom_err.a \
-	${utilib} \
+	${SRCDIR}lib/afs/util.a \
 	$(DBM)

 UKSRCS=authclient.c user.c kautils.h kaserver.h kaaux.c token.c \
       kalocalcell.c client.c kaerrors.c

-KLIBS = ${SRCDIR}lib/libubik.a ${SRCDIR}lib/afs/libprot.a \
-       ${SRCDIR}lib/afs/libauth.krb.a ${rxkadlib} ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a  \
-       ${SRCDIR}lib/liblwp.a ${deslib} ${cmdlib} \
-       ${SRCDIR}lib/afs/libcom_err.a ${utilib}
+KLIBS = ${SRCDIR}lib/libubik.a \
+	${SRCDIR}lib/afs/libprot.a \
+	${SRCDIR}lib/afs/libauth.krb.a \
+	${SRCDIR}lib/librxkad.a \
+	${SRCDIR}lib/afs/libsys.a \
+	${SRCDIR}lib/librx.a \
+	${SRCDIR}lib/afs/libsys.a  \
+	${SRCDIR}lib/liblwp.a \
+	${SRCDIR}lib/libdes.a \
+	${SRCDIR}lib/afs/libcmd.a \
+	${SRCDIR}lib/afs/libcom_err.a \
+	${SRCDIR}lib/afs/util.a 

 OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o 
 KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o
@ -72,8 +76,8 @@ test tests: install
 clean:
 	rm -f *.o kaserver kas klog multiklog kpasswd klogin rebuild kauth.cs.c kauth.ss.c kauth.xdr.c kauth.h kautils.h kaerrors.c *.a core kpwvalid AFS_component_version_number.c klog.krb knfs klogin.krb kdb Kkauth.xdr.c Kkauth.h Kkauth.cs.c

-kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) ${auditlib}
-	${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${auditlib}
+kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) 
+	${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${SRCDIR}lib/afs/libaudit.a

 kaserver.o: kaserver.c ${INCLS} AFS_component_version_number.o

@ -193,13 +197,13 @@ krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h \
 	   ${SRCDIR}include/lwp.h AFS_component_version_number.o

 krb_udp: krb_udp.o libkauth.a
-	${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${SRCDIR}lib/liblwp.a ${deslib} ${rxkadlib} ${SRCDIR}lib/afs/libcom_err.a ${utilib} ${auditlib}
+	${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/libdes.a ${SRCDIR}lib/librxkad.a ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/libutil.a ${SRCDIR}lib/afs/libaudit.a

 rebuild.o: rebuild.c $(INCLS) AFS_component_version_number.o

-rebuild: rebuild.o kautils.o ${SRCDIR}lib/afs/libcom_err.a ${utilib} $(deslib)
+rebuild: rebuild.o kautils.o ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${SRCDIR}lib/libdes.a
 	${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o \
-		${SRCDIR}lib/afs/libcom_err.a ${utilib} $(deslib) ${XLIBS} ${cmdlib}
+		${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${SRCDIR}lib/libdes.a ${XLIBS} ${SRCDIR}lib/afs/libcmd.a
 	${INSTALL} -f rebuild ${DESTDIR}etc/kadb_check

 system: install
--- a/src/kauth/test/Makefile.in
+++ b/src/kauth/test/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

-SRCDIR=DEST/
-DESTDIR=DEST/
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O

@ -14,8 +19,6 @@ INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
 LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
 LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkauth

-utilib=${SRCDIR}lib/afs/util.a
-
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}

 system: all
@ -28,10 +31,10 @@ clean:
 	rm -f *.o core

 multiklog: multiklog.o
-	cc -o  multiklog ${CFLAGS} multiklog.o ${utilib}
+	cc -o  multiklog ${CFLAGS} multiklog.o -lafsutil

 test_date: ../kautils.o test_date.o ${utilib}
-	cc -o test_date ${CFLAGS} test_date.o ../kautils.o ${utilib}
+	cc -o test_date ${CFLAGS} test_date.o ../kautils.o -lafsutil

 test_badtix: test_badtix.o
 	cc -o test_badtix ${CFLAGS} test_badtix.o
--- a/src/libacl/Makefile.in
+++ b/src/libacl/Makefile.in
@ -5,8 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=libacl
+
 include ../config/Makefile.${SYS_NAME}

 INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I.. \
--- a/src/libacl/test/Makefile.in
+++ b/src/libacl/test/Makefile.in
@ -5,14 +5,18 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

-SRCDIR=DEST/
-DESTDIR=DEST/
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O

 INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
 LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a
 LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS}

 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
--- a/src/libadmin/Makefile.in
+++ b/src/libadmin/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../config/Makefile.${SYS_NAME}

 system install: 
--- a/src/libadmin/adminutil/Makefile.in
+++ b/src/libadmin/adminutil/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}

--- a/src/libadmin/bos/Makefile.in
+++ b/src/libadmin/bos/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}

--- a/src/libadmin/cfg/Makefile.in
+++ b/src/libadmin/cfg/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}

--- a/src/libadmin/cfg/test/Makefile.in
+++ b/src/libadmin/cfg/test/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../../../config/Makefile.${SYS_NAME}

 CC = ${MT_CC}
--- a/src/libadmin/client/Makefile.in
+++ b/src/libadmin/client/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}

--- a/src/libadmin/kas/Makefile.in
+++ b/src/libadmin/kas/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}

--- a/src/libadmin/pts/Makefile.in
+++ b/src/libadmin/pts/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}

--- a/src/libadmin/samples/Makefile.in
+++ b/src/libadmin/samples/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../../config/Makefile.${SYS_NAME}

 CC = ${MT_CC}
--- a/src/libadmin/test/Makefile.in
+++ b/src/libadmin/test/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../../config/Makefile.${SYS_NAME}

 CC = ${MT_CC}
--- a/src/libadmin/vos/Makefile.in
+++ b/src/libadmin/vos/Makefile.in
@ -5,6 +5,11 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}

--- a/src/libafs/Makefile.common
+++ b/src/libafs/Makefile.common
@ -8,8 +8,6 @@
 # Common elements for Makefiles for all system types.
 #
 SHELL=/bin/sh
-DESTDIR = DEST/
-SRCDIR = DEST/
 INCLUDE= -I.  -I/usr/include -I${TOP_SRCDIR}/config
 Aobj=COMMON
 Dobj=DYNEL
--- a/src/libafs/MakefileProto.AIX.in
+++ b/src/libafs/MakefileProto.AIX.in
@ -7,8 +7,11 @@

 # MakefileProto for AIX systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}

 # OS specific object files:
--- a/src/libafs/MakefileProto.DARWIN.in
+++ b/src/libafs/MakefileProto.DARWIN.in
@ -3,8 +3,11 @@
 # 
 # MakefileProto for Digital Unix systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}


--- a/src/libafs/MakefileProto.DUX.in
+++ b/src/libafs/MakefileProto.DUX.in
@ -7,8 +7,11 @@

 # MakefileProto for Digital Unix systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}


--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@ -1,9 +1,12 @@
 #/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */
 #
-# MakefileProto for Digital Unix systems
+# MakefileProto for FreeBSD systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

-DESTDIR=DEST/
 # include ../config/Makefile.${SYS_NAME}

 # OS specific object files:
--- a/src/libafs/MakefileProto.HPUX.in
+++ b/src/libafs/MakefileProto.HPUX.in
@ -7,8 +7,11 @@

 # MakefileProto for HP systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}

 # OS specific object files:
@ -110,7 +113,7 @@ ${COMPDIRS}:
 		64)	bopts="$(KDEFS_64)"; bsuff="64";; \
 		esac; \
 		cd $$dir; \
-		$(MAKE) BITSUFFIX=$$bsuff CPU_KDEFS="$$bopts" DESTDIR=${DESTDIR} libafs || exit $$?; \
+		$(MAKE) BITSUFFIX=$$bsuff CPU_KDEFS="$$bopts" libafs || exit $$?; \
 		cd ..; \
 	    done; \
 	done; \
--- a/src/libafs/MakefileProto.IRIX.in
+++ b/src/libafs/MakefileProto.IRIX.in
@ -7,8 +7,11 @@

 # MakefileProto for IRIX systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}

 # OS specific object files:
@ -303,7 +306,7 @@ ${COMPDIRS}:
 			export CPU_KDEFS ;\
 			export LDFLAGS; \
 		cd $$dir ; \
-		$(MAKE) CPUARCH=$$p MPSP=$$n DESTDIR=../${DESTDIR} $$t.libafs || exit $$?;\
+		$(MAKE) CPUARCH=$$p MPSP=$$n $$t.libafs || exit $$?;\
 		cd ../ ; \
 	    done; \
 	  done; \
@ -340,7 +343,7 @@ ${COMPDIRS}:
 		export CPU_KDEFS ;\
 		export LDFLAGS ;\
 		cd $$dir ; \
-		$(MAKE) IPNO=$$p DESTDIR=${DESTDIR} $$t.libafs || exit $$?; \
+		$(MAKE) IPNO=$$p $$t.libafs || exit $$?; \
 		cd ../ ; \
 	  done; \
 	done
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@ -7,8 +7,11 @@

 # MakefileProto for Linux i386 systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

-DESTDIR=DEST/
 include ../config/Makefile.${SYS_NAME}

 # OS specific object files:
@ -133,7 +136,7 @@ ${COMPDIRS}:
 			TARG=libafs ; \
 		fi ; \
 		cd $${KDIR} ; \
-		$(MAKE) DESTDIR=${DESTDIR} SMP_DEF="$${SMP_DEF}" $${TARG} CLIENT=${LINUX_VERS}${LINUX_MODULE_NAME} || exit $$?; \
+		$(MAKE) SMP_DEF="$${SMP_DEF}" $${TARG} CLIENT=${LINUX_VERS}${LINUX_MODULE_NAME} || exit $$?; \
 		cd ../ ; \
 	done

--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@ -7,6 +7,11 @@

 # MakefileProto for Solaris systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../config/Makefile.${SYS_NAME}

 # OS specific object files:
@ -95,7 +100,7 @@ ${COMPDIRS}:
 		export ARCH_DEFS ; \
 		export BITS ; \
 		cd $$t  ; \
-		$(MAKE) DESTDIR=${DESTDIR}  libafs ; \
+		$(MAKE) libafs ; \
 		cd ../ ;\
 	done

--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@ -7,8 +7,13 @@

 # This is a pthread safe library containing ubikclient, auth, kauth.

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=libafsauthent
+
 include ../config/Makefile.${SYS_NAME}

 CC=${MT_CC}
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@ -7,8 +7,13 @@

 # This is a pthread safe library containing rx, rxkad and des.

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 SHELL = /bin/sh
-COMPONENT=libafsrpc
+
 include ../config/Makefile.${SYS_NAME}

 CC=${MT_CC}
@ -107,15 +112,7 @@ LIBOBJS = \
 	${RXSTATOBJS} \
 	${FSINTOBJS}

-system install:
-	if [ -f "../des/Makefile" ] ; then \
-		$(MAKE) install.lib ; \
-	else \
-		$(MAKE) libstub ; \
-	fi
-
-install.lib: ${DESTDIR}lib/libafsrpc.a
-
+system install: ${DESTDIR}lib/libafsrpc.a

 ${DESTDIR}lib/libafsrpc.a: libafsrpc.a
 	${INSTALL} libafsrpc.a ${DESTDIR}lib/libafsrpc.a
@ -363,12 +360,3 @@ afsaux.o: ${FSINT}/afsaux.c

 clean:
 	rm -f *.o libafsrpc*
-
-
-
-RM     = /bin/rm
-DESPAR =../../../DESLIB/dest/
-libstub:
-	echo "Installing libafsrpc stubs from ${DESPAR}:" `(csh -c 'cd ${DESPAR};pwd')`
-	${RM} -f ${DESTDIR}lib/libafsrpc.a
-	${INSTALL} ${DESPAR}lib/libafsrpc.a ${DESTDIR}lib/libafsrpc.a
--- a/src/libuafs/MakefileProto.AIX.in
+++ b/src/libuafs/MakefileProto.AIX.in
@ -8,6 +8,11 @@
 # MakefileProto for AIX systems
 #

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../config/Makefile.${SYS_NAME}

 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
--- a/src/libuafs/MakefileProto.DARWIN.in
+++ b/src/libuafs/MakefileProto.DARWIN.in
@ -8,6 +8,11 @@
 # MakefileProto for Solaris systems
 #

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../config/Makefile.${SYS_NAME}

 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
--- a/src/libuafs/MakefileProto.DUX.in
+++ b/src/libuafs/MakefileProto.DUX.in
@ -7,6 +7,12 @@

 # MakefileProto for Solaris systems
 #
+
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 DBUG=-O

 include ../config/Makefile.${SYS_NAME}
--- a/src/libuafs/MakefileProto.FBSD.in
+++ b/src/libuafs/MakefileProto.FBSD.in
@ -2,6 +2,10 @@
 # 
 # MakefileProto for Solaris systems
 #
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@

 include ../config/Makefile.${SYS_NAME}

--- a/src/libuafs/MakefileProto.HPUX.in
+++ b/src/libuafs/MakefileProto.HPUX.in
@ -8,6 +8,11 @@
 # MakefileProto for HP-UX systems
 #

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../config/Makefile.${SYS_NAME}

 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
--- a/src/libuafs/MakefileProto.IRIX.in
+++ b/src/libuafs/MakefileProto.IRIX.in
@ -8,6 +8,11 @@
 # MakefileProto for Solaris systems
 #

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../config/Makefile.${SYS_NAME}

 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
--- a/src/libuafs/MakefileProto.LINUX.in
+++ b/src/libuafs/MakefileProto.LINUX.in
@ -8,6 +8,11 @@
 # MakefileProto for Solaris systems
 #

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../config/Makefile.${SYS_NAME}

 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
--- a/src/libuafs/MakefileProto.SOLARIS.in
+++ b/src/libuafs/MakefileProto.SOLARIS.in
@ -8,6 +8,11 @@
 # MakefileProto for Solaris systems
 #

+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
 include ../config/Makefile.${SYS_NAME}

 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
--- a/src/log/Makefile.in
+++ b/src/log/Makefile.in
@ -5,11 +5,15 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

-COMPONENT=log
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
 include ../config/Makefile.${SYS_NAME}

 INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${DESTDIR}include/afs 
-utilib=${DESTDIR}lib/afs/util.a

 CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBUG}

--- a/src/log/test/Makefile.in
+++ b/src/log/test/Makefile.in
@ -5,15 +5,19 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html

-SRCDIR=DEST/
-DESTDIR=DEST/
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
+
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O

 INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include -I${DESTDIR}include/afs -I${BACKDIR}include/afs
 LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-utilib=${DESTDIR}lib/afs/util.a
-LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd ${utilib} ${XLIBS}
+LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd -lafsutil ${XLIBS}

 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}

--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@ -17,7 +17,12 @@
 # @(#)Makefile	5.1 (Berkeley) 10/18/88
 #

-COMPONENT=login
+DESTDIR=@DESTDIR@
+SRCDIR=@SRCDIR@
+TOP_SRCDIR=@TOP_SRCDIR@
+SYS_NAME=@AFS_SYSNAME@
+
+
 include ../config/Makefile.${SYS_NAME}

 LIBDIR = ${DESTDIR}lib/
--- a/Show More
+++ b/Show More