death-to-pinstall-20060801

Delete pinstall and convert the entire tree to use the install program found by configure (falling back on install-sh in the local tree). This means that we have to pre-create directories with install -d. Also redo the install and dest rules to be lists of install rules rather than dependencies driving separate make rules so that running make install will always update the target directory with the current code, even if there are files in the install area that are newer. Stop installing libafssetpag; we're about to kill it in favor of a different library. Remove some djgpp rules.
2025-01-18 06:50:12 +00:00 · 2006-08-01 21:03:54 +00:00 · 2006-08-01 21:03:54 +00:00 · 8df5dcbc91
commit 8df5dcbc91
parent 29dd792381
95 changed files with 2092 additions and 4601 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -30,16 +30,16 @@ COMPILE_PART2  = ${COMPILE_PART2A} ${COMPILE_PART2B}
 COMPILE_CLEAN  = ${COMPILE_PART2A} clean
 COMPILE_DEPINSTALL  = ${COMPILE_PART2A} depinstall

-all: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}
+all: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
 	$(MAKE) build

-all_nolibafs: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}
+all_nolibafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
 	$(MAKE) build TARGET=finale_nolibafs

-only_libafs: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}
+only_libafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
 	$(MAKE) build TARGET=libafs

-only_libafs_tree: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}
+only_libafs_tree: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
 	$(MAKE) build TARGET=libafs_tree

 install: all install_dirs
@ -53,15 +53,15 @@ install_only_libafs: only_libafs install_dirs

 dest: all dest_dirs
 	$(MAKE) build COMPILE_PART2B=dest
-	-${INSTALL} ${srcdir}/src/LICENSE ${DEST}/LICENSE
+	-${INSTALL_DATA} ${srcdir}/src/LICENSE ${DEST}/LICENSE

 dest_nolibafs: all_nolibafs dest_dirs
 	$(MAKE) build TARGET=finale_nolibafs COMPILE_PART2B=dest
-	-${INSTALL} ${srcdir}/src/LICENSE ${DEST}/LICENSE
+	-${INSTALL_DATA} ${srcdir}/src/LICENSE ${DEST}/LICENSE

 dest_only_libafs: only_libafs dest_dirs
 	$(MAKE) build TARGET=libafs COMPILE_PART2B=dest
-	-${INSTALL} ${srcdir}/src/LICENSE ${DEST}/LICENSE
+	-${INSTALL_DATA} ${srcdir}/src/LICENSE ${DEST}/LICENSE

 packages: dest
 	@case ${SYS_NAME} in \
@ -79,7 +79,7 @@ packages: dest
 		echo Not building packages for ${SYS_NAME} ;; \
 	esac

-${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR} ${TOP_JLIBDIR}:
+${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR} ${TOP_JLIBDIR}:
 	mkdir -p $@

 install_dirs: force
@ -112,10 +112,7 @@ tests: all
 config: 
 	${COMPILE_PART1} config ${COMPILE_PART2}

-pinstall: config
-	${COMPILE_PART1} pinstall ${COMPILE_PART2}
-
-procmgmt: pinstall
+procmgmt: config
 	${COMPILE_PART1} procmgmt ${COMPILE_PART2}

 util: procmgmt des
@ -138,10 +135,10 @@ cmd: comerr
 lwp: util lwp_depinstall
 	${COMPILE_PART1} lwp ${COMPILE_PART2}

-rxgen: pinstall 
+rxgen: config
 	${COMPILE_PART1} rxgen ${COMPILE_PART2}

-rx: pinstall lwp rxgen rx_depinstall
+rx: config lwp rxgen rx_depinstall
 	${COMPILE_PART1} rx ${COMPILE_PART2}

 rxstat: rx rxstat_depinstall
@ -165,10 +162,10 @@ export:
 export_build: fsint
 	${COMPILE_PART1} export ${COMPILE_PART2}

-afs: export pinstall comerr afs_depinstall
+afs: config export comerr afs_depinstall
 	${COMPILE_PART1} afs ${COMPILE_PART2}

-des: config pinstall
+des: config
 	${COMPILE_PART1} des ${COMPILE_PART2} 

 sys: cmd comerr afs des rx rxstat fsint sys_depinstall
@ -368,50 +365,50 @@ man-pages:
 #
 # encode dependencies within the _depinstall targets as required
 #
-lwp_depinstall: pinstall
+lwp_depinstall: config
 	${COMPILE_PART1} lwp ${COMPILE_DEPINSTALL}

-rx_depinstall: pinstall
+rx_depinstall: config
 	${COMPILE_PART1} rx ${COMPILE_DEPINSTALL}

-rxkad_depinstall: pinstall comerr
+rxkad_depinstall: config comerr
 	${COMPILE_PART1} rxkad ${COMPILE_DEPINSTALL}

-ubik_depinstall: pinstall comerr rxgen
+ubik_depinstall: config comerr rxgen
 	${COMPILE_PART1} ubik ${COMPILE_DEPINSTALL}

-vlserver_depinstall: pinstall rxgen ubik_depinstall auth_depinstall
+vlserver_depinstall: config rxgen ubik_depinstall auth_depinstall
 	${COMPILE_PART1} vlserver ${COMPILE_DEPINSTALL}

-auth_depinstall: pinstall comerr
+auth_depinstall: config comerr
 	${COMPILE_PART1} auth ${COMPILE_DEPINSTALL}

-fsint_depinstall: pinstall rxgen
+fsint_depinstall: config rxgen
 	${COMPILE_PART1} fsint ${COMPILE_DEPINSTALL}

-rxstat_depinstall: pinstall rxgen
+rxstat_depinstall: config rxgen
 	${COMPILE_PART1} rxstat ${COMPILE_DEPINSTALL}

-libacl_depinstall: pinstall
+libacl_depinstall: config
 	${COMPILE_PART1} libacl ${COMPILE_DEPINSTALL}

-afs_depinstall: pinstall comerr
+afs_depinstall: config comerr
 	${COMPILE_PART1} afs ${COMPILE_DEPINSTALL}

-dir_depinstall: pinstall
+dir_depinstall: config
 	${COMPILE_PART1} dir ${COMPILE_DEPINSTALL}

-sys_depinstall: pinstall
+sys_depinstall: config
 	${COMPILE_PART1} sys ${COMPILE_DEPINSTALL}

-kauth_depinstall: pinstall rxgen comerr
+kauth_depinstall: config rxgen comerr
 	${COMPILE_PART1} kauth ${COMPILE_DEPINSTALL}

-ptserver_depinstall: pinstall rxgen comerr
+ptserver_depinstall: config rxgen comerr
 	${COMPILE_PART1} ptserver ${COMPILE_DEPINSTALL}

 ${DEST}/bin/dedebug: dedebug
-	${INSTALL} -s $? $@
+	${INSTALL} $? $@


 #
@ -618,7 +615,6 @@ clean:

 clean2:
 	-${COMPILE_PART1} config ${COMPILE_CLEAN}
-	-${COMPILE_PART1} pinstall ${COMPILE_CLEAN}
 	-${COMPILE_PART1} procmgmt ${COMPILE_CLEAN}
 	-${COMPILE_PART1} util ${COMPILE_CLEAN}
 	-${COMPILE_PART1} audit ${COMPILE_CLEAN}
@ -780,8 +776,6 @@ distclean: clean
 	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 \
--- a/configure.in
+++ b/configure.in
@ -80,8 +80,6 @@ src/mpp/Makefile \
 src/null/Makefile \
 src/package/Makefile \
 src/pam/Makefile \
-src/pinstall/Makefile \
-src/pinstall/test/Makefile \
 src/procmgmt/Makefile \
 src/procmgmt/test/Makefile \
 src/ptserver/Makefile \
--- a/doc/man-pages/install-man.in
+++ b/doc/man-pages/install-man.in
@ -10,7 +10,8 @@ set -e
 manpage="$1"
 dest="$2"

-install=@TOP_OBJDIR@/src/pinstall/pinstall
+INSTALL="@INSTALL@"
+install="@INSTALL_DATA@"

 # We have to include all of the variables here since several of them refer to
 # each other and this is the only way we get them all expanded.
@ -47,5 +48,5 @@ sed -e "s%/usr/afs/local/BosConfig%${afsbosconfigdir}/BosConfig%g" \
    -e "s%/usr/afs/local%${afslocaldir}%g" \
    -e "s%/usr/afs/logs%${afslogsdir}%g" \
    -e "s%/usr/vice/etc%${viceetcdir}%g" "$manpage" > "$manpage".tmp
-$install -c -f -m 0644 "$manpage".tmp "$dest"
+$install "$manpage".tmp "$dest"
 rm "$manpage".tmp
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@ -12,13 +12,6 @@ include @TOP_OBJDIR@/src/config/Makefile.config

 all: depinstall

-depinstall: ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h \
-	${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/unified_afs.h ${TOP_INCDIR}/afs/sysctl.h
-	case ${SYS_NAME} in \
-		pmax_ul43 | pmax_ul43a) \
-			${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \
-	esac
-
 afs_trace.h afs_trace.msf: afs_trace.et
 	${COMPILE_ET} -v 2 -p ${srcdir} afs_trace.et

@ -43,109 +36,86 @@ afszcm.cat: afs_trace.msf
 			gencat afszcm.cat afs_trace.msf ;; \
 	esac

-install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h ${DESTDIR}${includedir}/afs/sysctl.h
+depinstall: afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h ${TOP_INCDIR}/afs/unified_afs.h ${TOP_INCDIR}/afs/sysctl.h
 	case ${SYS_NAME} in \
-		pmax_ul43 | pmax_ul43a) \
-			${INSTALL} longc_procs.h ${DESTDIR}${includedir}/afs ;; \
+	    pmax_ul43 | pmax_ul43a) \
+		${INSTALL} longc_procs.h ${TOP_INCDIR}/afs/longc_procs.h ;; \
+	esac
+
+${TOP_INCDIR}/afs/afs.h: afs.h
+	${INSTALL_DATA} afs.h $@
+
+${TOP_INCDIR}/afs/afs_stats.h: afs_stats.h
+	${INSTALL_DATA} afs_stats.h $@
+
+${TOP_INCDIR}/afs/exporter.h: exporter.h
+	${INSTALL_DATA} exporter.h $@
+
+${TOP_INCDIR}/afs/nfsclient.h: nfsclient.h
+	${INSTALL_DATA} nfsclient.h $@
+
+${TOP_INCDIR}/afs/osi_inode.h: ${MKAFS_OSTYPE}/osi_inode.h
+	${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_inode.h $@
+
+${TOP_INCDIR}/afs/sysctl.h: sysctl.h
+	${INSTALL_DATA} sysctl.h $@
+
+${TOP_INCDIR}/afs/unified_afs.h: unified_afs.h
+	${INSTALL_DATA} unified_afs.h $@
+
+install: unified_afs.h
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} afs.h ${DESTDIR}${includedir}/afs/afs.h
+	${INSTALL_DATA} afs_stats.h ${DESTDIR}${includedir}/afs/afs_stats.h
+	${INSTALL_DATA} exporter.h ${DESTDIR}${includedir}/afs/exporter.h
+	${INSTALL_DATA} nfsclient.h ${DESTDIR}${includedir}/afs/nfsclient.h
+	${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_inode.h \
+	    ${DESTDIR}${includedir}/afs/osi_inode.h
+	${INSTALL_DATA} sysctl.h ${DESTDIR}${includedir}/afs/sysctl.h
+	${INSTALL_DATA} unified_afs.h ${DESTDIR}${includedir}/afs/unified_afs.h
+	case ${SYS_NAME} in \
+	    pmax_ul43 | pmax_ul43a) \
+		${INSTALL_DATA} longc_procs.h \
+		    ${DESTDIR}${includedir}/afs/longc_procs.h ;; \
 	esac
 	case ${SYS_NAME} in \
-		*linux* ) \
-			${INSTALL} ${MKAFS_OSTYPE}/osi_vfs.h ${DESTDIR}${includedir}/afs || true ;;\
-		* ) \
-			echo No vfs headers to install for ${SYS_NAME};; \
+	    *linux*) \
+		${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_vfs.h \
+		    ${DESTDIR}${includedir}/afs/osi_vfs.h || true ;;\
+	    *) \
+		echo No vfs headers to install for ${SYS_NAME};; \
+	esac
+
+dest: unified_afs.h
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} afs.h ${DEST}/include/afs/afs.h
+	${INSTALL_DATA} afs_stats.h ${DEST}/include/afs/afs_stats.h
+	${INSTALL_DATA} exporter.h ${DEST}/include/afs/exporter.h
+	${INSTALL_DATA} nfsclient.h ${DEST}/include/afs/nfsclient.h
+	${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_inode.h ${DEST}/include/afs/osi_inode.h
+	${INSTALL_DATA} sysctl.h ${DEST}/include/afs/sysctl.h
+	${INSTALL_DATA} unified_afs.h ${DEST}/include/afs/unified_afs.h
+	case ${SYS_NAME} in \
+	    pmax_ul43 | pmax_ul43a) \
+		${INSTALL_DATA} longc_procs.h ${DEST}/include/afs/longc_procs.h ;; \
+	esac
+	case ${SYS_NAME} in \
+	    next_mach30 | vax_ul43 | *_darwin* | i386_fbsd*) \
+		echo skipping afszcm.cat install for ${SYS_NAME} ;; \
+	    *) \
+		${INSTALL_DATA} afszcm.cat \
+		    ${DEST}/root.client/usr/vice/etc/C/afszcm.cat ;; \
+	esac
+	case ${SYS_NAME} in \
+	    *linux*) \
+		${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_vfs.h \
+		    ${DEST}/include/afs/osi_vfs.h || true ;;\
+	    *) \
+		echo No vfs headers to install for ${SYS_NAME};; \
 	esac

 clean:
 	-$(RM) -f *.o core AFS_component_version_number.c afs_trace.h afs_trace.msf afszcm.cat
 	-$(RM) -f unified_afs.c unified_afs.h
+
 include ../config/Makefile.version
-${DEST}/include/afs/afs.h: afs.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs.h: afs.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/afs.h: afs.h
-	${INSTALL} $? $@
-
-
-${DEST}/include/afs/unified_afs.h: unified_afs.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/unified_afs.h: unified_afs.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/unified_afs.h: unified_afs.h
-	${INSTALL} $? $@
-
-
-${DEST}/include/afs/osi_inode.h: ${MKAFS_OSTYPE}/osi_inode.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/osi_inode.h: ${MKAFS_OSTYPE}/osi_inode.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/osi_inode.h: ${MKAFS_OSTYPE}/osi_inode.h
-	${INSTALL} $? $@
-
-
-${DEST}/include/afs/afs_stats.h: afs_stats.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_stats.h: afs_stats.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/afs_stats.h: afs_stats.h
-	${INSTALL} $? $@
-
-
-${DEST}/include/afs/sysctl.h: sysctl.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/sysctl.h: sysctl.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/sysctl.h: sysctl.h
-	${INSTALL} $? $@
-
-
-${DEST}/include/afs/exporter.h: exporter.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/exporter.h: exporter.h
-	${INSTALL} $? $@
-
-
-${TOP_INCDIR}/afs/exporter.h: exporter.h
-	${INSTALL} $? $@
-
-
-${DEST}/include/afs/nfsclient.h: nfsclient.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/nfsclient.h: nfsclient.h
-	${INSTALL} $? $@
-
-
-${TOP_INCDIR}/afs/nfsclient.h: nfsclient.h
-	${INSTALL} $? $@
-
-
-dest:   ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h ${DEST}/include/afs/sysctl.h
-	case ${SYS_NAME} in \
-		pmax_ul43 | pmax_ul43a) \
-			${INSTALL} longc_procs.h ${DEST}/include/afs ;; \
-	esac
-	case ${SYS_NAME} in \
-		next_mach30 | vax_ul43 | *_darwin* | i386_fbsd* ) \
-			echo skipping afszcm.cat install for ${SYS_NAME} ;; \
-		* ) \
-			${INSTALL} afszcm.cat ${DEST}/root.client/usr/vice/etc/C ;; \
-	esac
-	case ${SYS_NAME} in \
-		*linux* ) \
-			${INSTALL} ${MKAFS_OSTYPE}/osi_vfs.h ${DEST}/include/afs || true;;\
-		* ) \
-			echo No vfs headers to install for ${SYS_NAME};; \
-	esac
-
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@ -41,69 +41,81 @@ clean:
 system: install

 # XXX-INST: where to put the rc scripts?
-install: ${DESTDIR}${sbindir}/afsd ${DESTDIR}${sbindir}/vsys
+install: afsd vsys
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL} afsd ${DESTDIR}${sbindir}/afsd
+	${INSTALL} vsys ${DESTDIR}${sbindir}/vsys

-${DESTDIR}${sbindir}/afsd: afsd
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/vsys: vsys
-	${INSTALL} $? $@
-
-
-dest: ${DEST}/root.client/usr/vice/etc/afsd ${DEST}/etc/vsys
+dest: afsd vsys
+	${INSTALL} -d ${DEST}/root.client/usr/vice/etc
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL} afsd ${DEST}/root.client/usr/vice/etc/afsd
+	${INSTALL} vsys ${DEST}/etc/vsys
 	case ${SYS_NAME} in \
 		rs_aix*)  \
-			${INSTALL} -f ${srcdir}/rc.afs.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.afs ; \
-			${INSTALL} -f ${srcdir}/rc.dkload.client.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.client ; \
-			${INSTALL} -f ${srcdir}/rc.dkload.server.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.server ;; \
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \
+			${INSTALL_SCRIPT} ${srcdir}/rc.afs.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.afs ; \
+			${INSTALL_SCRIPT} ${srcdir}/rc.dkload.client.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.client ; \
+			${INSTALL_SCRIPT} ${srcdir}/rc.dkload.server.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.server ;; \
 		sgi_65 ) \
-			${INSTALL} -f ${srcdir}/afs.rc.sgi_ipnos ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\
-			${INSTALL} -f ${srcdir}/afs.rc.sgi_ipnos ${DEST}/root.server/etc/init.d/afs.rc ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/sgiload ; \
+			${INSTALL} -d ${DEST}/root.server/etc/init.d ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.sgi_ipnos ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.sgi_ipnos ${DEST}/root.server/etc/init.d/afs.rc ;;\
 		sgi_* ) \
-			${INSTALL} -f ${srcdir}/afs.rc.sgi ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\
-			${INSTALL} -f ${srcdir}/afs.rc.sgi ${DEST}/root.server/etc/init.d/afs.rc ;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/sgiload ; \
+			${INSTALL} -d ${DEST}/root.server/etc/init.d ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.sgi ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.sgi ${DEST}/root.server/etc/init.d/afs.rc ;\
 			case ${SYS_NAME} in \
 				sgi_53 | sgi_61 ) \
-				${INSTALL} -f ${srcdir}/afs_rtsymtab.pl.${SYS_NAME} ${DEST}/root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\
+				${INSTALL_SCRIPT} ${srcdir}/afs_rtsymtab.pl.${SYS_NAME} ${DEST}/root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\
 			esac;; \
 		sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4m_54 | sun4_54 | sun4c_54 | sunx86_54) \
-			${INSTALL} -f ${srcdir}/afs.rc.solaris ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.solaris ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
 		sun*_57 ) \
-			${INSTALL} -f ${srcdir}/afs.rc.solaris.2.7 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.solaris.2.7 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
 		sun*_58 ) \
-			${INSTALL} -f ${srcdir}/afs.rc.solaris.2.8 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.solaris.2.8 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
 		sun*_59 | sun*_510 ) \
-			${INSTALL} -f ${srcdir}/afs.rc.solaris.2.9 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.solaris.2.9 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
                sun4x_5? ) \
-                        ${INSTALL} -f ${srcdir}/afs.rc.solaris.2_5 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.solaris.2_5 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
 		alpha_osf* ) \
-			${INSTALL} -f ${srcdir}/afs.rc.alpha ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.alpha ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
 		hp_ux1122 ) \
-			${INSTALL} -f ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\
-			${INSTALL} -f ${srcdir}/afs.hpux1122.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\
+			${INSTALL_DATA} ${srcdir}/afs.hpux1122.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\
 		hp_ux10? | hp_ux11? ) \
-			${INSTALL} -f ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\
-			${INSTALL} -f ${srcdir}/afs.hpux102.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\
+			${INSTALL_DATA} ${srcdir}/afs.hpux102.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\
 		alpha_dux* ) \
-			${INSTALL} -f ${srcdir}/afs.rc.alpha_dux40 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.alpha_dux40 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
                hp?00_ux10? ) \
-			${INSTALL} -f ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\
 		*linux* ) \
-			${INSTALL} -f ${srcdir}/afs.rc.linux -m 755 ${DEST}/root.client/usr/vice/etc/afs.rc; \
-			${INSTALL} -f ${srcdir}/afs.conf.linux ${DEST}/root.client/usr/vice/etc/afs.conf ;; \
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.linux -m 755 ${DEST}/root.client/usr/vice/etc/afs.rc; \
+			${INSTALL_DATA} ${srcdir}/afs.conf.linux ${DEST}/root.client/usr/vice/etc/afs.conf ;; \
 		*_darwin*) \
-			${INSTALL} -f ${srcdir}/afs.rc.darwin -m 755 ${DEST}/root.client/usr/vice/etc/afs.rc ; \
-			${INSTALL} -f ${srcdir}/afs.rc.darwin.plist ${DEST}/root.client/usr/vice/etc/StartupParameters.plist ;; \
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.darwin -m 755 ${DEST}/root.client/usr/vice/etc/afs.rc ; \
+			${INSTALL_DATA} ${srcdir}/afs.rc.darwin.plist ${DEST}/root.client/usr/vice/etc/StartupParameters.plist ;; \
 		*fbsd*) \
-			${INSTALL} -f ${srcdir}/afs.rc.fbsd ${DEST}/root.client/usr/vice/etc/afs.rc.fbsd ;; \
+			${INSTALL} -d ${DEST}/root.client/usr/vice/etc ; \
+			${INSTALL_SCRIPT} ${srcdir}/afs.rc.fbsd ${DEST}/root.client/usr/vice/etc/afs.rc.fbsd ;; \
 		* )  \
 			echo No rc scripts installed for ${SYS_NAME} ;; \
 	esac

-${DEST}/root.client/usr/vice/etc/afsd: afsd
-	${INSTALL} $? $@
-
-${DEST}/etc/vsys: vsys
-	${INSTALL} $? $@
-
 include ../config/Makefile.version
--- a/src/afsmonitor/Makefile.in
+++ b/src/afsmonitor/Makefile.in
@ -50,21 +50,15 @@ afsmon-parselog:  afsmon-parselog.o ${LIBS}
 	${CC} ${CFLAGS} -o afsmon-parselog afsmon-parselog.c \
 		${LIBS} ${EXTRA_LIBS}

-#
-# Misc others
-#
-install:  ${DESTDIR}${bindir}/afsmonitor
+install: afsmonitor
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} afsmonitor ${DESTDIR}${bindir}/afsmonitor
+
+dest: afsmonitor
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL} afsmonitor ${DEST}/bin/afsmonitor

 clean:
 	$(RM) -f *.o afsmonitor AFS_component_version_number.c

 include ../config/Makefile.version
-${DEST}/bin/afsmonitor: afsmonitor
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/afsmonitor: afsmonitor
-	${INSTALL} $? $@
-
-
-dest:  ${DEST}/bin/afsmonitor
-
--- a/src/afsweb/Makefile.in
+++ b/src/afsweb/Makefile.in
@ -37,82 +37,100 @@ system apache_afs_web_secure:
 			echo Clean, make, and install the lib for 1.2 ; \
 			$(MAKE) libclean ; \
 			$(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) ; \
-			${INSTALL} ${APACHE_AFS_LIB} ${DEST}/root.afsweb/lib/apache_1.2 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/lib/apache_1.2 ; \
+			${INSTALL_DATA} ${APACHE_AFS_LIB} ${DEST}/root.afsweb/lib/apache_1.2/${APACHE_AFS_LIB} ; \
 			echo Make and install source for 1.2 ; \
 			/bin/rm -f $(SRC_MODULE) ; \
 			$(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \
-			${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.2 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/src/apache_1.2 ; \
+			${INSTALL_DATA} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.2/$(SRC_MODULE) ; \
 			echo Make and install the lib for 1.3.1 ; \
 			$(MAKE) libclean ; \
 			$(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-			${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.1 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/lib/apache_1.3.1 ; \
+			${INSTALL_DATA} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.1/$(APACHE_AFS_LIB) ; \
 			echo Make and install source for 1.3.1 ; \
 			/bin/rm -f $(SRC_MODULE) ; \
 			$(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-			${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.1 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/src/apache_1.3.1 ; \
+			${INSTALL_DATA} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.1/$(SRC_MODULE) ; \
 			echo Clean, make, and install the lib for 1.3.6 ; \
 			$(MAKE) libclean ; \
 			$(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6"; \
-			${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.6 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/lib/apache_1.3.6 ; \
+			${INSTALL_DATA} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.6/$(APACHE_AFS_LIB) ; \
 			/bin/rm -f $(SRC_MODULE) ; \
 			echo Make and install source for 1.3.1 ; \
 			$(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-			${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.6 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/src/apache_1.3.6 ; \
+			${INSTALL_DATA} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.6 ; \
 			echo Do the binaries ; \
 			$(MAKE) AUX_CFLAGS=-DAIX $(BINARIES) ;; \
 		sun*) \
 			$(MAKE) libclean ; \
 			$(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) ; \
-			${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.2 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/lib/apache_1.2 ; \
+			${INSTALL_DATA} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.2/$(APACHE_AFS_LIB) ; \
 			$(MAKE) libclean ; \
 			$(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-			${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.1 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/lib/apache_1.3.1 ; \
+			${INSTALL_DATA} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.1/$(APACHE_AFS_LIB) ; \
 			$(MAKE) libclean ; \
 			$(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-			${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.6 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/lib/apache_1.3.6 ; \
+			${INSTALL_DATA} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.6/$(APACHE_AFS_LIB) ; \
 			/bin/rm -f $(SRC_MODULE) ; \
 			$(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \
-			${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.2 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/src/apache_1.2 ; \
+			${INSTALL_DATA} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.2/$(SRC_MODULE) ; \
 			/bin/rm -f $(SRC_MODULE) ; \
 			$(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-			${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.1 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/src/apache_1.3.1 ; \
+			${INSTALL_DATA} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.1/$(SRC_MODULE) ; \
 			/bin/rm -f $(SRC_MODULE) ; \
 			$(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-			${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.6 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/src/apache_1.3.6 ; \
+			${INSTALL_DATA} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.6/$(SRC_MODULE) ; \
 			$(MAKE) AUX_CFLAGS=-DSOLARIS "XLIBS=-lsocket -lnsl" $(BINARIES) ;; \
 		*linux*) \
 			$(MAKE) libclean ; \
 			$(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) ; \
-			${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.2 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/lib/apache_1.2 ; \
+			${INSTALL_DATA} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.2/$(APACHE_AFS_LIB) ; \
 			$(MAKE) libclean ; \
 			$(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-			${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.1 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/lib/apache_1.3.1 ; \
+			${INSTALL_DATA} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.1/$(APACHE_AFS_LIB) ; \
 			$(MAKE) libclean ; \
 			$(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-			${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.6 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/lib/apache_1.3.6 ; \
+			${INSTALL_DATA} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.6/$(APACHE_AFS_LIB) ; \
 			/bin/rm -f $(SRC_MODULE) ; \
 			$(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \
-			${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.2 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/src/apache_1.2 ; \
+			${INSTALL_DATA} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.2/$(SRC_MODULE) ; \
 			/bin/rm -f $(SRC_MODULE) ; \
 			$(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \
-			${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.1 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/src/apache_1.3.1 ; \
+			${INSTALL_DATA} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.1/$(SRC_MODULE) ; \
 			/bin/rm -f $(SRC_MODULE) ; \
 			$(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \
-			${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.6 ; \
+			${INSTALL} -d ${DEST}/root.afsweb/src/apache_1.3.6 ; \
+			${INSTALL_DATA} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.6/$(SRC_MODULE) ; \
 			$(MAKE) AUX_CFLAGS=-DLINUX "XLIBS=-lnsl" $(BINARIES) ;; \
 		* ) \
 			 echo "NOT BUILT FOR ${SYS_NAME}"; ;; \
 	esac
-	${INSTALL} ${APACHEAFS_DOC} ${DEST}/root.afsweb/doc
-	${INSTALL} ${APACHE_INSTALL_SCRIPT} ${DEST}/root.afsweb/install
-	chmod a+x ${DEST}/root.afsweb/install/${APACHE_INSTALL_SCRIPT}
-	chmod a+w ${DEST}/root.afsweb/install/${APACHE_INSTALL_SCRIPT}
-	${INSTALL} $(BINARIES) ${DEST}/root.afsweb/bin
+	${INSTALL} -d ${DEST}/root.afsweb/doc
+	${INSTALL_DATA} ${APACHEAFS_DOC} ${DEST}/root.afsweb/doc/${APACHEAFS_DOC}
+	${INSTALL} -d ${DEST}/root.afsweb/install
+	${INSTALL_SCRIPT} ${APACHE_INSTALL_SCRIPT} ${DEST}/root.afsweb/install/${APACHE_INSTALL_SCRIPT}
+	${INSTALL} -d ${DEST}/root.afsweb/bin
+	${INSTALL_PROGRAM} $(BINARIES) ${DEST}/root.afsweb/bin

 netscape_afs_web_secure:
-	${INSTALL} ${NETSCAPE_INSTALL_SCRIPT} ${DEST}/root.afsweb/install
-	chmod a+x ${DEST}/root.afsweb/install/${NETSCAPE_INSTALL_SCRIPT}
-	chmod a+w ${DEST}/root.afsweb/install/${NETSCAPE_INSTALL_SCRIPT}
+	${INSTALL} -d ${DEST}/root.afsweb/install
+	${INSTALL} -m 755 ${NETSCAPE_INSTALL_SCRIPT} ${DEST}/root.afsweb/install

 all: 

--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@ -27,23 +27,21 @@ asetkey: asetkey.o ${AFSLIBS}
 #
 # Installation targets
 #
-install: \
-	${DESTDIR}${bindir}/aklog ${DESTDIR}${afssrvbindir}/asetkey
+install: aklog @ASETKEY@
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL_PROGRAM} aklog ${DESTDIR}${bindir}/aklog
+	set -e ; if test "x@ASETKEY@" != "x"; then \
+		${INSTALL} -d ${DESTDIR}${afssrvbindir} ; \
+		${INSTALL_PROGRAM} asetkey ${DESTDIR}${afssrvbindir}/asetkey ; \
+	fi

-${DESTDIR}${bindir}/aklog: aklog
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvbindir}/asetkey: @ASETKEY@
-	if test "x@ASETKEY@" != "x"; then ${INSTALL} $? $@; fi
-
-dest: \
-	${DEST}/bin/aklog ${DEST}/root.server/usr/afs/bin/asetkey
-
-${DEST}/bin/aklog: aklog
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/asetkey: @ASETKEY@
-	if test "x@ASETKEY@" != "x"; then ${INSTALL} $? $@; fi
+dest: aklog @ASETKEY@
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL_PROGRAM} aklog ${DEST}/bin/aklog
+	set -e ; if test "x@ASETKEY@" != "x"; then \
+		${INSTALL} -d ${DEST}/root.server/usr/afs/bin ; \
+		${INSTALL_PROGRAM} asetkey ${DEST}/root.server/usr/afs/bin/asetkey ; \
+	fi

 #
 # Misc. targets
@ -52,4 +50,3 @@ clean:
 	$(RM) -f *.o ${OBJS} aklog asetkey

 include ../config/Makefile.version
-
--- a/src/audit/Makefile.in
+++ b/src/audit/Makefile.in
@ -19,16 +19,11 @@ CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCF

 all: ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h

-# XXX-INST: where to install the AIX audit files?
-install: \
-	${DESTDIR}${libdir}/afs/libaudit.a \
-	${DESTDIR}${includedir}/afs/audit.h
+${TOP_LIBDIR}/libaudit.a: libaudit.a
+	${INSTALL_DATA} $? $@

-${DEST}/include/afs/audit.h: audit.h
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libaudit.a: libaudit.a
-	${INSTALL} $? $@
+${TOP_INCDIR}/afs/audit.h: audit.h
+	${INSTALL_DATA} $? $@

 libaudit.a: audit.o AFS_component_version_number.o
 	$(RM) -f libaudit.a
@ -38,29 +33,29 @@ libaudit.a: audit.o AFS_component_version_number.o
 audit.o: audit.c audit.h 
 	${CC} ${CFLAGS} -c ${srcdir}/audit.c

+# XXX-INST: where to install the AIX audit files?
+install: audit.h libaudit.a
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libaudit.a ${DESTDIR}${libdir}/afs/libaudit.a
+	${INSTALL_DATA} audit.h ${DESTDIR}${includedir}/afs/audit.h
+
+dest: libaudit.a audit.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libaudit.a ${DEST}/lib/afs/libaudit.a
+	${INSTALL_DATA} audit.h ${DEST}/include/afs/audit.h
+	case ${SYS_NAME} in \
+	rs_aix*) \
+	   ${INSTALL} -d ${DEST}/root.server/usr/afs/local ; \
+	   ${INSTALL_DATA} ${srcdir}/Audit              ${DEST}/root.server/usr/afs/local/Audit ;  \
+	   ${INSTALL_DATA} ${srcdir}/objects.aix.sample ${DEST}/root.server/usr/afs/local/audit/objects.sample ;  \
+	   ${INSTALL_DATA} ${srcdir}/events.aix.sample  ${DEST}/root.server/usr/afs/local/audit/events.sample  ;  \
+	   ${INSTALL_DATA} ${srcdir}/config.aix.sample  ${DEST}/root.server/usr/afs/local/audit/config.sample  ;; \
+        *) ;; \
+        esac ;
+
 clean:
 	$(RM) -f *.a *.o core AFS_component_version_number.c

 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/libaudit.a: libaudit.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libaudit.a: libaudit.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/audit.h: audit.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/audit.h: audit.h
-	${INSTALL} $? $@
-
-dest:  ${DEST}/lib/afs/libaudit.a ${DEST}/include/afs/audit.h
-	case ${SYS_NAME} in \
-	rs_aix*) \
-	   ${INSTALL} ${srcdir}/Audit              ${DEST}/root.server/usr/afs/local ;  \
-	   ${INSTALL} ${srcdir}/objects.aix.sample ${DEST}/root.server/usr/afs/local/audit/objects.sample ;  \
-	   ${INSTALL} ${srcdir}/events.aix.sample  ${DEST}/root.server/usr/afs/local/audit/events.sample  ;  \
-	   ${INSTALL} ${srcdir}/config.aix.sample  ${DEST}/root.server/usr/afs/local/audit/config.sample  ;; \
-        *) ;; \
-        esac ;
-
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@ -22,19 +22,31 @@ KSRCS=auth.h
 UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \
       ktc.c authcon.c ktc_errors.c

-all: \
-	${TOP_LIBDIR}/libauth.a \
-	${TOP_LIBDIR}/libauth.krb.a \
-	depinstall \
-	copyauth \
-	setkey
+all: ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a depinstall copyauth setkey

-depinstall: \
-	${TOP_INCDIR}/afs/keys.h \
+depinstall: ${TOP_INCDIR}/afs/keys.h \
 	${TOP_INCDIR}/afs/cellconfig.h \
 	${TOP_INCDIR}/afs/auth.h \
 	${TOP_INCDIR}/afs/ktc.h

+${TOP_INCDIR}/afs/keys.h: keys.h
+	${INSTALL_DATA} keys.h $@
+
+${TOP_INCDIR}/afs/cellconfig.h: cellconfig.h
+	${INSTALL_DATA} cellconfig.h $@
+
+${TOP_INCDIR}/afs/auth.h: auth.h
+	${INSTALL_DATA} auth.h $@
+
+${TOP_INCDIR}/afs/ktc.h: ktc.h
+	${INSTALL_DATA} ktc.h $@
+
+${TOP_LIBDIR}/libauth.a: libauth.a
+	${INSTALL_DATA} libauth.a $@
+
+${TOP_LIBDIR}/libauth.krb.a: libauth.krb.a
+	${INSTALL_DATA} libauth.krb.a $@
+
 cellconfig.o: cellconfig.c ${INCLS}
 ktc.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
 writeconfig.o: writeconfig.c ${INCLS}
@ -78,14 +90,27 @@ ktc_errors.c auth.h: ktc_errors.et auth.p.h
 #
 # Install targets
 #
-install: \
-	${DESTDIR}${libdir}/afs/libauth.a \
-	${DESTDIR}${libdir}/afs/libauth.krb.a \
-	${DESTDIR}${includedir}/afs/keys.h \
-	${DESTDIR}${includedir}/afs/cellconfig.h \
-	${DESTDIR}${includedir}/afs/auth.h \
-	${DESTDIR}${includedir}/afs/ktc.h \
-	${DESTDIR}${sbindir}/copyauth 
+install: copyauth libauth.a libauth.krb.a auth.h cellconfig.h
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libauth.a ${DESTDIR}${libdir}/afs/libauth.a
+	${INSTALL_DATA} libauth.krb.a ${DESTDIR}${libdir}/afs/libauth.krb.a
+	${INSTALL_DATA} keys.h ${DESTDIR}${includedir}/afs/keys.h
+	${INSTALL_DATA} cellconfig.h ${DESTDIR}${includedir}/afs/cellconfig.h
+	${INSTALL_DATA} auth.h ${DESTDIR}${includedir}/afs/auth.h
+	${INSTALL_DATA} ktc.h ${DESTDIR}${includedir}/afs/ktc.h
+	${INSTALL_PROGRAM} copyauth ${DESTDIR}${sbindir}/copyauth 
+
+dest: copyauth libauth.a libauth.krb.a auth.h cellconfig.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libauth.a ${DEST}/lib/afs/libauth.a
+	${INSTALL_DATA} libauth.krb.a ${DEST}/lib/afs/libauth.krb.a
+	${INSTALL_DATA} keys.h ${DEST}/include/afs/keys.h
+	${INSTALL_DATA} cellconfig.h ${DEST}/include/afs/cellconfig.h
+	${INSTALL_DATA} auth.h ${DEST}/include/afs/auth.h
+	${INSTALL_DATA} ktc.h ${DEST}/include/afs/ktc.h
+	${INSTALL_PROGRAM} copyauth ${DEST}/etc/copyauth

 #
 # Misc. targets
@ -98,73 +123,3 @@ clean:
 	AFS_component_version_number.c

 include ../config/Makefile.version
-
-
-${DESTDIR}${libdir}/afs/libauth.a: libauth.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libauth.a: libauth.a
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libauth.a: libauth.a
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libauth.krb.a: libauth.krb.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libauth.krb.a: libauth.krb.a
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libauth.krb.a: libauth.krb.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/keys.h: keys.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/keys.h: keys.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/keys.h: keys.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/cellconfig.h: cellconfig.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/cellconfig.h: cellconfig.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/cellconfig.h: cellconfig.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/auth.h: auth.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/auth.h: auth.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/auth.h: auth.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ktc.h: ktc.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ktc.h: ktc.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/ktc.h: ktc.h
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/copyauth: copyauth
-	${INSTALL} $? $@
-
-${DEST}/etc/copyauth: copyauth
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/lib/afs/libauth.a \
-	${DEST}/lib/afs/libauth.krb.a \
-	${DEST}/include/afs/keys.h \
-	${DEST}/include/afs/cellconfig.h \
-	${DEST}/include/afs/auth.h \
-	${DEST}/include/afs/ktc.h \
-	${DEST}/etc/copyauth 
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@ -41,6 +41,15 @@ bosoprocs.o cronbnodeops.o

 all: bosserver ${TOP_INCDIR}/afs/bosint.h bos ${TOP_LIBDIR}/libbos.a ${TOP_INCDIR}/afs/bnode.h bos_util

+${TOP_INCDIR}/afs/bosint.h: bosint.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/bnode.h: bnode.h
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libbos.a: libbos.a
+	${INSTALL_DATA} $? $@
+
 $(OBJS) bosint.xdr.o bosint.cs.o boserr.o: $(INCLS)

 bosint.ss.o: bosint.ss.c ${RPCINCLS}
@ -100,35 +109,32 @@ bosserver: $(OBJS) $(LIBS)
 #
 # Install targets
 #
-install: \
-	${DESTDIR}${afssrvsbindir}/bosserver \
-	${DESTDIR}${includedir}/afs/bosint.h \
-	${DESTDIR}${bindir}/bos \
-	${DESTDIR}${afssrvbindir}/bos \
-	${DESTDIR}${afssrvsbindir}/bos_util \
-	${DESTDIR}${libdir}/afs/libbos.a \
-	${DESTDIR}${includedir}/afs/bnode.h
+install: bosserver bos bos_util libbos.a bosint.h bnode.h
+	${INSTALL} -d ${DESTDIR}${afssrvbindir}
+	${INSTALL} -d ${DESTDIR}${afssrvsbindir}
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_PROGRAM} bosserver ${DESTDIR}${afssrvsbindir}/bosserver
+	${INSTALL_DATA} bosint.h ${DESTDIR}${includedir}/afs/bosint.h
+	${INSTALL_PROGRAM} bos ${DESTDIR}${bindir}/bos
+	${INSTALL_PROGRAM} bos ${DESTDIR}${afssrvbindir}/bos
+	${INSTALL_PROGRAM} bos_util ${DESTDIR}${afssrvsbindir}/bos_util
+	${INSTALL_DATA} libbos.a ${DESTDIR}${libdir}/afs/libbos.a
+	${INSTALL_DATA} bnode.h ${DESTDIR}${includedir}/afs/bnode.h

-${DEST}/root.server/usr/afs/bin/bosserver: bosserver
-	${INSTALL} $? $@
-
-${DEST}/include/afs/bosint.h: bosint.h
-	${INSTALL} $? $@
-
-${DEST}/bin/bos: bos
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/bos: bos
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/bos_util: bos_util
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libbos.a: libbos.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/bnode.h: bnode.h
-	${INSTALL} $? $@
+dest: bosserver bos bos_util libbos.a bosint.h bnode.h
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_PROGRAM} bosserver ${DEST}/root.server/usr/afs/bin/bosserver
+	${INSTALL_DATA} bosint.h ${DEST}/include/afs/bosint.h
+	${INSTALL_PROGRAM} bos ${DEST}/bin/bos
+	${INSTALL_PROGRAM} bos ${DEST}/root.server/usr/afs/bin/bos
+	${INSTALL_PROGRAM} bos_util ${DEST}/root.server/usr/afs/bin/bos_util
+	${INSTALL_DATA} libbos.a ${DEST}/lib/afs/libbos.a
+	${INSTALL_DATA} bnode.h ${DEST}/include/afs/bnode.h

 #
 # Misc. targets
@ -142,41 +148,4 @@ test:
 	cd test; $(MAKE) 

 include ../config/Makefile.version
-${DESTDIR}${afssrvsbindir}/bosserver: bosserver
-	${INSTALL} $? $@

-${DESTDIR}${includedir}/afs/bosint.h: bosint.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/bosint.h: bosint.h
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/bos: bos
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvbindir}/bos: bos
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/bos_util: bos_util
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libbos.a: libbos.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libbos.a: libbos.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/bnode.h: bnode.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/bnode.h: bnode.h
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/root.server/usr/afs/bin/bosserver \
-	${DEST}/include/afs/bosint.h \
-	${DEST}/bin/bos \
-	${DEST}/root.server/usr/afs/bin/bos \
-	${DEST}/root.server/usr/afs/bin/bos_util \
-	${DEST}/lib/afs/libbos.a \
-	${DEST}/include/afs/bnode.h
--- a/src/bu_utils/Makefile.in
+++ b/src/bu_utils/Makefile.in
@ -21,18 +21,15 @@ fms: fms.o

 fms.o:  fms.c AFS_component_version_number.o

-install: ${DESTDIR}${sbindir}/fms
+install: fms
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL_PROGRAM} fms ${DESTDIR}${sbindir}/fms

-${DEST}/etc/fms: fms
-	${INSTALL} $? $@
+dest: fms
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL_PROGRAM} fms ${DEST}/etc/fms

 clean:
 	$(RM) -f *.o fms AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${sbindir}/fms: fms
-	${INSTALL} $? $@
-
-dest: ${DEST}/etc/fms
-
--- a/src/bubasics/Makefile.in
+++ b/src/bubasics/Makefile.in
@ -12,6 +12,27 @@ all: ${TOP_LIBDIR}/libbubasics.a ${TOP_INCDIR}/afs/bumon.h ${TOP_INCDIR}/afs/but

 OBJS=butc.ss.o butc.cs.o butc.xdr.o bumon.ss.o bumon.cs.o bumon.xdr.o butc_errs.o butm_errs.o butx_errs.o

+${TOP_LIBDIR}/libbubasics.a: libbubasics.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/bumon.h: bumon.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/butc.h: butc.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/bubasics.h: bubasics.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/tcdata.h: tcdata.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/butm.h: butm.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/butx.h: butx.h
+	${INSTALL_DATA} $? $@
+
 libbubasics.a: $(OBJS) AFS_component_version_number.o
 	-$(RM) -f libbubasics.a
 	ar r libbubasics.a ${OBJS} AFS_component_version_number.o
@ -64,28 +85,27 @@ butx_errs.c butx.h: butx_errs.et
 #
 # Installation targets
 #
-install: ${DESTDIR}${libdir}/afs/libbubasics.a ${DESTDIR}${includedir}/afs/bumon.h ${DESTDIR}${includedir}/afs/butc.h ${DESTDIR}${includedir}/afs/bubasics.h ${DESTDIR}${includedir}/afs/tcdata.h ${DESTDIR}${includedir}/afs/butm.h ${DESTDIR}${includedir}/afs/butx.h
+install: libbubasics.a bumon.h butc.h bubasics.h tcdata.h butm.h butx.h
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libbubasics.a ${DESTDIR}${libdir}/afs/libbubasics.a
+	${INSTALL_DATA} bumon.h ${DESTDIR}${includedir}/afs/bumon.h
+	${INSTALL_DATA} butc.h ${DESTDIR}${includedir}/afs/butc.h
+	${INSTALL_DATA} bubasics.h ${DESTDIR}${includedir}/afs/bubasics.h
+	${INSTALL_DATA} tcdata.h ${DESTDIR}${includedir}/afs/tcdata.h
+	${INSTALL_DATA} butm.h ${DESTDIR}${includedir}/afs/butm.h
+	${INSTALL_DATA} butx.h ${DESTDIR}${includedir}/afs/butx.h

-${DEST}/lib/afs/libbubasics.a: libbubasics.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/bumon.h: bumon.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/butc.h: butc.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/bubasics.h: bubasics.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/tcdata.h: tcdata.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/butm.h: butm.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/butx.h: butx.h
-	${INSTALL} $? $@
+dest: libbubasics.a bumon.h butc.h bubasics.h tcdata.h butm.h butx.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libbubasics.a ${DEST}/lib/afs/libbubasics.a
+	${INSTALL_DATA} bumon.h ${DEST}/include/afs/bumon.h
+	${INSTALL_DATA} butc.h ${DEST}/include/afs/butc.h
+	${INSTALL_DATA} bubasics.h ${DEST}/include/afs/bubasics.h
+	${INSTALL_DATA} tcdata.h ${DEST}/include/afs/tcdata.h
+	${INSTALL_DATA} butm.h ${DEST}/include/afs/butm.h
+	${INSTALL_DATA} butx.h ${DEST}/include/afs/butx.h

 #
 # Common targets
@ -96,47 +116,3 @@ clean:
 		butc_errs.c butx_errs.c butm_errs.c core AFS_component_version_number.c

 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/libbubasics.a: libbubasics.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libbubasics.a: libbubasics.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/bumon.h: bumon.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/bumon.h: bumon.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/butc.h: butc.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/butc.h: butc.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/bubasics.h: bubasics.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/bubasics.h: bubasics.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/tcdata.h: tcdata.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/tcdata.h: tcdata.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/butm.h: butm.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/butm.h: butm.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/butx.h: butx.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/butx.h: butx.h
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/afs/libbubasics.a ${DEST}/include/afs/bumon.h ${DEST}/include/afs/butc.h ${DEST}/include/afs/bubasics.h ${DEST}/include/afs/tcdata.h ${DEST}/include/afs/butm.h ${DEST}/include/afs/butx.h
-
--- a/src/bucoord/Makefile.in
+++ b/src/bucoord/Makefile.in
@ -20,6 +20,9 @@ LIBS=${TOP_LIBDIR}/libbudb.a ${TOP_LIBDIR}/libbubasics.a \

 all: ${TOP_LIBDIR}/libbxdb.a backup

+${TOP_LIBDIR}/libbxdb.a: libbxdb.a
+	${INSTALL_DATA} $? $@
+
 libbxdb.a: dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_component_version_number.o
 	-$(RM) -f $@
 	$(AR) crv $@ dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_component_version_number.o
@ -62,13 +65,17 @@ bucoord_errs.c bc.h:	bucoord_errs.et bc.p.h
 # Install targets
 #

-install: ${DESTDIR}${libdir}/afs/libbxdb.a ${DESTDIR}${sbindir}/backup
+install: libbxdb.a backup
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL_DATA} libbxdb.a ${DESTDIR}${libdir}/afs/libbxdb.a
+	${INSTALL_PROGRAM} backup ${DESTDIR}${sbindir}/backup

-${DEST}/lib/afs/libbxdb.a: libbxdb.a
-	${INSTALL} $? $@
-
-${DEST}/etc/backup: backup
-	${INSTALL} $? $@
+dest: libbxdb.a backup
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL_DATA} libbxdb.a ${DEST}/lib/afs/libbxdb.a
+	${INSTALL_PROGRAM} backup ${DEST}/etc/backup

 #
 # Misc targets
@ -78,14 +85,3 @@ clean:
 	$(RM) -f *.o backup convert *.ss.c *.cs.c *.xdr.c *.a core btest ttest AFS_component_version_number.c bc.h bucoord_errs.c

 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/libbxdb.a: libbxdb.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libbxdb.a: libbxdb.a
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/backup: backup
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/afs/libbxdb.a ${DEST}/etc/backup
-
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@ -47,6 +47,18 @@ SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o

 all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_client.h budb_server

+${TOP_LIBDIR}/libbudb.a: libbudb.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/budb.h: budb.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/budb_errs.h: budb_errs.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/budb_client.h: budb_client.h
+	${INSTALL_DATA} $? $@
+
 #
 # budb_errs.o actually depends on neither budb_client.h nor budb_errs.h
 # but generating either of them will rebuild budb_errs.c
@ -97,27 +109,25 @@ libbudb.a: budb_errs.o budb.cs.o budb.xdr.o struct_ops.o AFS_component_version_n
 #
 # Install targets
 #
-install: \
-	${DESTDIR}${libdir}/afs/libbudb.a \
-	${DESTDIR}${includedir}/afs/budb.h \
-	${DESTDIR}${includedir}/afs/budb_errs.h \
-	${DESTDIR}${includedir}/afs/budb_client.h \
-	${DESTDIR}${afssrvlibexecdir}/buserver
+install: libbudb.a budb.h budb_errs.h budb_client.h budb_server
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL_DATA} libbudb.a ${DESTDIR}${libdir}/afs/libbudb.a
+	${INSTALL_DATA} budb.h ${DESTDIR}${includedir}/afs/budb.h
+	${INSTALL_DATA} budb_errs.h ${DESTDIR}${includedir}/afs/budb_errs.h
+	${INSTALL_DATA} budb_client.h ${DESTDIR}${includedir}/afs/budb_client.h
+	${INSTALL_PROGRAM} budb_server ${DESTDIR}${afssrvlibexecdir}/buserver

-${DEST}/lib/afs/libbudb.a: libbudb.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/budb.h: budb.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/budb_errs.h: budb_errs.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/budb_client.h: budb_client.h
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/buserver: budb_server
-	${INSTALL} -f $? $@
+dest: libbudb.a budb.h budb_errs.h budb_client.h budb_server
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_DATA} libbudb.a ${DEST}/lib/afs/libbudb.a
+	${INSTALL_DATA} budb.h ${DEST}/include/afs/budb.h
+	${INSTALL_DATA} budb_errs.h ${DEST}/include/afs/budb_errs.h
+	${INSTALL_DATA} budb_client.h ${DEST}/include/afs/budb_client.h
+	${INSTALL_PROGRAM} budb_server ${DEST}/root.server/usr/afs/bin/buserver

 #
 # Misc targets
@ -127,37 +137,3 @@ clean:
 		*.ss.c *.cs.c core budb_server AFS_component_version_number.c

 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/libbudb.a: libbudb.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libbudb.a: libbudb.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/budb.h: budb.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/budb.h: budb.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/budb_errs.h: budb_errs.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/budb_errs.h: budb_errs.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/budb_client.h: budb_client.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/budb_client.h: budb_client.h
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvlibexecdir}/buserver: budb_server
-	${INSTALL} -f $? $@
-
-dest: \
-	${DEST}/lib/afs/libbudb.a \
-	${DEST}/include/afs/budb.h \
-	${DEST}/include/afs/budb_errs.h \
-	${DEST}/include/afs/budb_client.h \
-	${DEST}/root.server/usr/afs/bin/buserver
-
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@ -82,34 +82,36 @@ read_tape: read_tape.c
 clean:
 	$(RM) -f butc *.o butc_test core tdump read_tape AFS_component_version_number.c

-install:  
+install: butc read_tape
+	${INSTALL} -d ${DESTDIR}${sbindir}
 	@case ${SYS_NAME} in \
 	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux*) \
 		echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
 	*_darwin_[1-6][0-9]) \
-		echo ${INSTALL} butc ${DEST}/etc/butc ; \
-		${INSTALL} butc ${DEST}/etc/butc ;; \
+		echo ${INSTALL_PROGRAM} butc ${DESTDIR}${sbindir}/butc ; \
+		${INSTALL_PROGRAM} butc ${DESTDIR}${sbindir}/butc ;; \
 	*_darwin_*) \
 		echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
 	*) \
-		echo ${INSTALL} butc ${DESTDIR}${sbindir}/butc ; \
-		${INSTALL} butc ${DESTDIR}${sbindir}/butc ;; \
+		echo ${INSTALL_PROGRAM} butc ${DESTDIR}${sbindir}/butc ; \
+		${INSTALL_PROGRAM} butc ${DESTDIR}${sbindir}/butc ;; \
 	esac
-	${INSTALL} read_tape ${DESTDIR}${sbindir}/read_tape
+	${INSTALL_PROGRAM} read_tape ${DESTDIR}${sbindir}/read_tape
+
+dest: butc read_tape
+	${INSTALL} -d ${DEST}/etc
+	@case ${SYS_NAME} in \
+	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux*) \
+		echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
+	*_darwin_[1-6][0-9]) \
+		echo ${INSTALL_PROGRAM} butc ${DEST}/etc/butc ; \
+		${INSTALL_PROGRAM} butc ${DEST}/etc/butc ;; \
+	*_darwin_*) \
+		echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
+	*) \
+		echo ${INSTALL_PROGRAM} butc ${DEST}/etc/butc ; \
+		${INSTALL_PROGRAM} butc ${DEST}/etc/butc ;; \
+	esac
+	${INSTALL_PROGRAM} read_tape ${DEST}/etc/read_tape

 include ../config/Makefile.version
-dest:  
-	@case ${SYS_NAME} in \
-	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux*) \
-		echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
-	*_darwin_[1-6][0-9]) \
-		echo ${INSTALL} butc ${DESTDIR}${sbindir}/butc ; \
-		${INSTALL} butc ${DESTDIR}${sbindir}/butc ;; \
-	*_darwin_*) \
-		echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
-	*) \
-		echo ${INSTALL} butc ${DEST}/etc/butc ; \
-		${INSTALL} butc ${DEST}/etc/butc ;; \
-	esac
-	${INSTALL} read_tape ${DEST}/etc/read_tape
-
--- a/src/butm/Makefile.in
+++ b/src/butm/Makefile.in
@ -21,10 +21,8 @@ LIBS=${TOP_LIBDIR}/libbubasics.a \

 all: ${TOP_LIBDIR}/libbutm.a

-install: ${DESTDIR}${libdir}/afs/libbutm.a
-
-${DEST}/lib/afs/libbutm.a: libbutm.a
-	${INSTALL} $? $@
+${TOP_LIBDIR}/libbutm.a: libbutm.a
+	${INSTALL_DATA} $? $@

 libbutm.a: file_tm.o AFS_component_version_number.o
 	-$(RM) -f $@
@ -41,15 +39,15 @@ test_ftm: test_ftm.o libbutm.a
 test: test_ftm
 	echo 'Usage: ./test_ftm -conf config -tape xxx *'

+install: libbutm.a
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} libbutm.a ${DESTDIR}${libdir}/afs/libbutm.a
+
+dest: libbutm.a
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} libbutm.a ${DEST}/lib/afs/libbutm.a
+
 clean:
 	$(RM) -f *.o *.a core test_ftm AFS_component_version_number.c

 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/libbutm.a: libbutm.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libbutm.a: libbutm.a
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/afs/libbutm.a
-
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@ -643,7 +643,6 @@ case $AFS_SYSNAME in
 		;;

 	sgi_62)
-		PINSTALL_LIBS=-lmld
 		AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
 		FSINCLUDES="-I/usr/include/sys/fs"
 		LEX="lex"
@ -658,7 +657,6 @@ case $AFS_SYSNAME in
 		;;

 	sgi_63)
-		PINSTALL_LIBS=-lmld
 		AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
 		FSINCLUDES="-I/usr/include/sys/fs"
 		LEX="lex"
@ -1045,7 +1043,6 @@ AC_SUBST(PAM_CFLAGS)
 AC_SUBST(PAM_LIBS)
 AC_SUBST(PAM_DBG)
 AC_SUBST(PAM_OPTMZ)
-AC_SUBST(PINSTALL_LIBS)
 AC_SUBST(RANLIB)
 AC_SUBST(REGEX_OBJ)
 AC_SUBST(RM)
--- a/src/cmd/Makefile.in
+++ b/src/cmd/Makefile.in
@ -15,6 +15,15 @@ all: ${TOP_LIBDIR}/libcmd.a ${TOP_INCDIR}/afs/cmd.h

 all64: all ${TOP_LIBDIR}/libcmd64.a

+${TOP_LIBDIR}/libcmd.a: libcmd.a
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libcmd64.a: libcmd64.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/cmd.h: cmd.h
+	${INSTALL_DATA} $? $@
+
 cmd.h: cmd_errors.et cmd.p.h
 	$(RM) -f cmd.h cmd_errors.c
 	${COMPILE_ET} -p ${srcdir} cmd_errors -h cmd
@ -31,7 +40,6 @@ cmd_errors64.o: cmd_errors.c
 cmd64.o: cmd.c cmd.h
 	${CC} ${OPTMZ} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o ${srcdir}/cmd.c

-
 libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o
 	-$(RM) -f $@
 	$(AR) crv $@ ${LIB64OBJS} AFS_component_version_number64.o
@ -48,18 +56,23 @@ AFS_component_version_number64.o: AFS_component_version_number.c
 #
 # Install targets
 #
-install: ${DESTDIR}${libdir}/afs/libcmd.a ${DESTDIR}${includedir}/afs/cmd.h
+install: libcmd.a cmd.h
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libcmd.a ${DESTDIR}${libdir}/afs/libcmd.a
+	${INSTALL_DATA} cmd.h ${DESTDIR}${includedir}/afs/cmd.h

-install64: install ${DESTDIR}${libdir}/afs/libcmd64.a
+install64: install libcmd64.a
+	${INSTALL_DATA} libcmd64.a ${DESTDIR}${libdir}/afs/libcmd64.a

-${DEST}/include/afs/cmd.h: cmd.h
-	${INSTALL} $? $@
+dest: libcmd.a cmd.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libcmd.a ${DEST}/lib/afs/libcmd.a
+	${INSTALL_DATA} cmd.h ${DEST}/include/afs/cmd.h

-${DEST}/lib/afs/libcmd.a: libcmd.a
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libcmd64.a: libcmd64.a
-	${INSTALL} $? $@
+dest64: dest libcmd64.a
+	${INSTALL_DATA} libcmd64.a ${DEST}/lib/afs/libcmd64.a

 #
 # Misc targets
@ -71,24 +84,3 @@ clean:
 	$(RM) -f  *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c

 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/libcmd.a: libcmd.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libcmd.a: libcmd.a
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libcmd64.a: libcmd64.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libcmd64.a: libcmd64.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/cmd.h: cmd.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/cmd.h: cmd.h
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/afs/libcmd.a ${DEST}/include/afs/cmd.h
-
-dest64: dest ${DEST}/lib/afs/libcmd64.a
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@ -9,6 +9,18 @@ include @TOP_OBJDIR@/src/config/Makefile.config

 all: compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libcom_err.a

+${TOP_INCDIR}/afs/com_err.h: com_err.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/error_table.h: error_table.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/mit-sipb-cr.h: mit-sipb-cr.h
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libcom_err.a: libcom_err.a
+	${INSTALL_DATA} $? $@
+
 et_lex.lex.c: et_lex.lex.l
 	$(RM) -f et_lex.lex.c
 	$(LEX) -t $(srcdir)/et_lex.lex.l > et_lex.lex.c
@ -25,25 +37,29 @@ libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o
 	$(RM) -f $@
 	$(AR) crv $@ error_msg.o et_name.o com_err.o AFS_component_version_number.o
 	$(RANLIB) $@
+
 #
 # Installation targets
 #
-install:  ${DESTDIR}${bindir}/compile_et ${DESTDIR}${includedir}/afs/com_err.h ${DESTDIR}${includedir}/afs/error_table.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h ${DESTDIR}${libdir}/afs/libcom_err.a
+install: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_PROGRAM} compile_et ${DESTDIR}${bindir}/compile_et
+	${INSTALL_DATA} com_err.h ${DESTDIR}${includedir}/afs/com_err.h
+	${INSTALL_DATA} error_table.h ${DESTDIR}${includedir}/afs/error_table.h
+	${INSTALL_DATA} mit-sipb-cr.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h
+	${INSTALL_DATA} libcom_err.a ${DESTDIR}${libdir}/afs/libcom_err.a

-${DEST}/bin/compile_et: compile_et
-	${INSTALL} $? $@
-
-${DEST}/include/afs/com_err.h: com_err.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/error_table.h: error_table.h 
-	${INSTALL} $? $@
-
-${DEST}/include/afs/mit-sipb-cr.h: mit-sipb-cr.h
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libcom_err.a: libcom_err.a
-	${INSTALL} $? $@
+dest: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_PROGRAM} compile_et ${DEST}/bin/compile_et
+	${INSTALL_DATA} com_err.h ${DEST}/include/afs/com_err.h
+	${INSTALL_DATA} error_table.h ${DEST}/include/afs/error_table.h
+	${INSTALL_DATA} mit-sipb-cr.h ${DEST}/include/afs/mit-sipb-cr.h
+	${INSTALL_DATA} libcom_err.a ${DEST}/lib/afs/libcom_err.a

 clean:
 	$(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
@ -59,32 +75,3 @@ compile_et.o:  AFS_component_version_number.c
 error_table.o: et_lex.lex.c

 include ../config/Makefile.version
-${DESTDIR}${bindir}/compile_et: compile_et
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/com_err.h: com_err.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/com_err.h: com_err.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/error_table.h: error_table.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/error_table.h: error_table.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/mit-sipb-cr.h: mit-sipb-cr.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/mit-sipb-cr.h: mit-sipb-cr.h
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libcom_err.a: libcom_err.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libcom_err.a: libcom_err.a
-	${INSTALL} $? $@
-
-dest:  ${DEST}/bin/compile_et ${DEST}/include/afs/com_err.h ${DEST}/include/afs/error_table.h ${DEST}/include/afs/mit-sipb-cr.h ${DEST}/lib/afs/libcom_err.a
-
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@ -63,7 +63,6 @@ PAM_CFLAGS = @PAM_CFLAGS@
 PAM_LIBS = @PAM_LIBS@
 PAM_OPTMZ = @PAM_OPTMZ@
 PAM_DBG = @PAM_DBG@
-PINSTALL_LIBS = @PINSTALL_LIBS@
 RANLIB = @RANLIB@
 REGEX_OBJ = @REGEX_OBJ@
 RM = @RM@
@ -116,8 +115,10 @@ KERNELDIR = ../libafs
 # Build helper apps
 #
 COMPILE_ET = ${TOP_OBJDIR}/src/comerr/compile_et
-INSTALL = ${TOP_OBJDIR}/src/pinstall/pinstall
-INSTALLex = ${INSTALL} -m 755
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 RXGEN = ${TOP_OBJDIR}/src/rxgen/rxgen
 SHELL = /bin/sh

--- a/src/dauth/Makefile.in
+++ b/src/dauth/Makefile.in
@ -33,15 +33,10 @@ LIBS=${TOP_LIBDIR}/libkauth.a \
 CELL=		`pwd|awk -F/ '{print $$3}'`
 USNS=		cellname

-include ../config/Makefile.version
-
 noversion:	install

 all: dlog dpass

-clean:
-		$(RM) -f adkint.h adkint.cs.c adkint.ss.c adkint.xdr.c *.o dlog dpass AFS_component_version_number.c
-
 adkint.cs.o:	adkint.cs.c
 adkint.xdr.o:	adkint.xdr.c adkint.h

@ -68,19 +63,17 @@ dlog_test:	dlog.c $(OBJS) $(LIBS)
 		$(CC) $(LDFLAGS) -DDLOG_TEST -o dlog_test dlog.c $(OBJS) \
 			$(LIBS) ${XLIBS}

-${DEST}/bin/dlog: dlog
-	${INSTALL} $? $@
+install: dlog dpass
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL_PROGRAM} dlog ${DESTDIR}${bindir}/dlog
+	${INSTALL_PROGRAM} dpass ${DESTDIR}${bindir}/dpass

-${DEST}/bin/dpass: dpass
-	${INSTALL} $? $@
+dest: dlog dpass
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL_PROGRAM} dlog ${DEST}/bin/dlog
+	${INSTALL_PROGRAM} dpass ${DEST}/bin/dpass

+clean:
+	$(RM) -f adkint.h adkint.cs.c adkint.ss.c adkint.xdr.c *.o dlog dpass AFS_component_version_number.c

-install:  ${DESTDIR}${bindir}/dlog ${DESTDIR}${bindir}/dpass
-${DESTDIR}${bindir}/dlog: dlog
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/dpass: dpass
-	${INSTALL} $? $@
-
-dest:  ${DEST}/bin/dlog ${DEST}/bin/dpass
-
+include ../config/Makefile.version
--- a/src/des/Makefile.in
+++ b/src/des/Makefile.in
@ -50,6 +50,24 @@ all: \
 	${TOP_INCDIR}/mit-cpyright.h \
 	${TOP_INCDIR}/des_odd.h

+${TOP_LIBDIR}/libdes.a: libdes.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/des.h: des.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/des_prototypes.h: des_prototypes.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/des_conf.h: des_conf.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/mit-cpyright.h: mit-cpyright.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/des_odd.h: odd.h
+	${INSTALL_DATA} $? $@
+
 #
 # Build rules
 #
@ -155,31 +173,25 @@ make_e.o: make_e.c ${INCLS}
 #
 # Install targets
 #
-install:  \
-	${DESTDIR}${libdir}/libdes.a \
-	${DESTDIR}${includedir}/des.h \
-	${DESTDIR}${includedir}/des_prototypes.h \
-	${DESTDIR}${includedir}/des_conf.h \
-	${DESTDIR}${includedir}/mit-cpyright.h \
-	${DESTDIR}${includedir}/des_odd.h
+install: libdes.a des.h des_prototypes.h des_conf.h mit-cpyright.h odd.h
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL} -d ${DESTDIR}${includedir}
+	${INSTALL_DATA} libdes.a ${DESTDIR}${libdir}/libdes.a
+	${INSTALL_DATA} des.h ${DESTDIR}${includedir}/des.h
+	${INSTALL_DATA} des_prototypes.h ${DESTDIR}${includedir}/des_prototypes.h
+	${INSTALL_DATA} des_conf.h ${DESTDIR}${includedir}/des_conf.h
+	${INSTALL_DATA} mit-cpyright.h ${DESTDIR}${includedir}/mit-cpyright.h
+	${INSTALL_DATA} odd.h ${DESTDIR}${includedir}/des_odd.h

-${DEST}/lib/libdes.a: libdes.a
-	${INSTALL} $? $@
-
-${DEST}/include/des.h: des.h
-	${INSTALL} $? $@
-
-${DEST}/include/des_prototypes.h: des_prototypes.h
-	${INSTALL} $? $@
-
-${DEST}/include/des_conf.h: des_conf.h
-	${INSTALL} $? $@
-
-${DEST}/include/mit-cpyright.h: mit-cpyright.h
-	${INSTALL} $? $@
-
-${DEST}/include/des_odd.h: odd.h
-	${INSTALL} $? $@
+dest: libdes.a des.h des_prototypes.h des_conf.h mit-cpyright.h odd.h
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL} -d ${DEST}/include
+	${INSTALL_DATA} libdes.a ${DEST}/lib/libdes.a
+	${INSTALL_DATA} des.h ${DEST}/include/des.h
+	${INSTALL_DATA} des_prototypes.h ${DEST}/include/des_prototypes.h
+	${INSTALL_DATA} des_conf.h ${DEST}/include/des_conf.h
+	${INSTALL_DATA} mit-cpyright.h ${DEST}/include/mit-cpyright.h
+	${INSTALL_DATA} odd.h ${DEST}/include/des_odd.h

 #
 # Misc. targets
@ -195,48 +207,3 @@ clean:
 	cd test; $(MAKE) clean

 include ../config/Makefile.version
-
-${DESTDIR}${libdir}/libdes.a: libdes.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libdes.a: libdes.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/des.h: des.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/des.h: des.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/des_prototypes.h: des_prototypes.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/des_prototypes.h: des_prototypes.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/des_conf.h: des_conf.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/des_conf.h: des_conf.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/mit-cpyright.h: mit-cpyright.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/mit-cpyright.h: mit-cpyright.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/des_odd.h: odd.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/des_odd.h: odd.h
-	${INSTALL} $? $@
-
-dest:  \
-	${DEST}/lib/libdes.a \
-	${DEST}/include/des.h \
-	${DEST}/include/des_prototypes.h \
-	${DEST}/include/des_conf.h \
-	${DEST}/include/mit-cpyright.h \
-	${DEST}/include/des_odd.h
-
--- a/src/dir/Makefile.in
+++ b/src/dir/Makefile.in
@ -15,6 +15,12 @@ all: \
 depinstall: \
 	${TOP_INCDIR}/afs/dir.h 

+${TOP_INCDIR}/afs/dir.h: dir.h
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libdir.a: libdir.a
+	${INSTALL_DATA} $? $@
+
 libdir.a: buffer.o dir.o salvage.o AFS_component_version_number.o
 	$(RM) -f $@
 	$(AR) crv $@ buffer.o dir.o salvage.o  AFS_component_version_number.o
@ -33,36 +39,22 @@ salvage.o: salvage.c dir.h
 #
 # Install targets
 #
-${TOP_INCDIR}/afs/dir.h: dir.h
-	${INSTALL} $? $@
+install: libdir.a dir.h
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libdir.a ${DESTDIR}${libdir}/afs/libdir.a
+	${INSTALL_DATA} dir.h ${DESTDIR}${includedir}/afs/dir.h

-${TOP_LIBDIR}/libdir.a: libdir.a
-	${INSTALL} $? $@
-
-install: \
-	${DESTDIR}${libdir}/afs/libdir.a \
-	${DESTDIR}${includedir}/afs/dir.h
-
-${DESTDIR}${libdir}/afs/libdir.a: libdir.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/dir.h: dir.h
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/lib/afs/libdir.a \
-	${DEST}/include/afs/dir.h
-
-${DEST}/lib/afs/libdir.a: libdir.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/dir.h: dir.h
-	${INSTALL} $? $@
+dest: libdir.a dir.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libdir.a ${DEST}/lib/afs/libdir.a
+	${INSTALL_DATA} dir.h ${DEST}/include/afs/dir.h

 #
 # Misc. targets
 #
-include ../config/Makefile.version
-
 clean:
 	$(RM) -f *.o *.a core AFS_component_version_number.c
+
+include ../config/Makefile.version
--- a/src/export/Makefile.in
+++ b/src/export/Makefile.in
@ -12,30 +12,29 @@ include @TOP_OBJDIR@/src/config/Makefile.config
  IMPORTS = /lib/kernex.exp /lib/syscalls.exp ${srcdir}/extras.exp
     KOBJ = export.o symtab.o

-include ../config/Makefile.version
+EXPORTS64 = @AIX64@export64.ext.nonfs export64.ext cfgexport64 cfgafs64

 all: ${TOP_LIBDIR}/export.exp ${TOP_LIBDIR}/export64.exp ${TOP_LIBDIR}/extras.exp cfgexport cfgafs
-	${INSTALL} ${srcdir}/export.h ${KERNELDIR}
-	${INSTALL} export.exp ${KERNELDIR}
-	${INSTALL} export64.exp ${KERNELDIR}
-	${INSTALL} ${srcdir}/export.h ${UKERNELDIR}
-	${INSTALL} export64.exp ${UKERNELDIR}
-	${INSTALL} export.exp ${UKERNELDIR}
+	${INSTALL} -d ${KERNELDIR}
+	${INSTALL} -d ${UKERNELDIR}
+	${INSTALL_DATA} ${srcdir}/export.h ${KERNELDIR}/export.h
+	${INSTALL_DATA} export.exp ${KERNELDIR}/export.exp
+	${INSTALL_DATA} export64.exp ${KERNELDIR}/export64.exp
+	${INSTALL_DATA} ${srcdir}/export.h ${UKERNELDIR}/export.h
+	${INSTALL_DATA} export64.exp ${UKERNELDIR}/export64.exp
+	${INSTALL_DATA} export.exp ${UKERNELDIR}/export.exp
+
+${TOP_LIBDIR}/export.exp: export.exp
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/export64.exp: export64.exp
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/extras.exp: ${srcdir}/extras.exp
+	${INSTALL_DATA} $? $@

 noversion system: install

-install:    ${DESTDIR}${afskerneldir}/export.ext \
-	${DESTDIR}${afskerneldir}/export.ext.nonfs \
-	${DESTDIR}${afskerneldir}/export64.ext.nonfs \
-	${DESTDIR}${libdir}/afs/export.exp \
-	${DESTDIR}${libdir}/afs/export64.exp \
-	${DESTDIR}${libdir}/afs/extras.exp \
-	${DESTDIR}${afskerneldir}/cfgexport \
-	${DESTDIR}${afskerneldir}/cfgafs \
-	${DESTDIR}${afskerneldir}/export64.ext \
-	${DESTDIR}${afskerneldir}/cfgexport64 \
-	${DESTDIR}${afskerneldir}/cfgafs64 
-
 export.exp: ${srcdir}/export4.exp ${srcdir}/export5.exp
 	case ${SYS_NAME} in \
 	rs_aix4* ) \
@ -80,7 +79,7 @@ export.o export64.o: ${srcdir}/export.c
 		mv export.o export64.o ; \
 		${CC} ${CFLAGS} -DAFS_AIX51_ENV -c ${srcdir}/export.c ;; \
 	esac
-               
+
 export.nonfs.o export64.nonfs.o: ${srcdir}/export.c
 	case ${SYS_NAME} in \
 	rs_aix4* ) \
@ -119,91 +118,36 @@ clean:
 	$(RM) -f cfgafs cfgafs64
 	$(RM) -f *.ext *.ext.nonfs

-${DEST}/root.client/usr/vice/etc/dkload/export.ext: export.ext
-	${INSTALL} $? $@
+install: export.ext export.ext.nonfs export.exp export64.exp cfgexport \
+		cfgafs $(EXPORTS64)
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} export.ext ${DESTDIR}${afskerneldir}/export.ext
+	${INSTALL_DATA} export.ext.nonfs ${DESTDIR}${afskerneldir}/export.ext.nonfs
+	${INSTALL_DATA} export.exp ${DESTDIR}${libdir}/afs/export.exp
+	${INSTALL_DATA} export64.exp ${DESTDIR}${libdir}/afs/export64.exp
+	${INSTALL_DATA} ${srcdir}/extras.exp ${DESTDIR}${libdir}/afs/extras.exp
+	${INSTALL_DATA} cfgexport ${DESTDIR}${afskerneldir}/cfgexport
+	${INSTALL_DATA} cfgafs ${DESTDIR}${afskerneldir}/cfgafs
+	@AIX64@${INSTALL_DATA} export64.ext.nonfs ${DESTDIR}${afskerneldir}/export64.ext.nonfs
+	@AIX64@${INSTALL_DATA} export64.ext ${DESTDIR}${afskerneldir}/export64.ext
+	@AIX64@${INSTALL_DATA} cfgexport64 ${DESTDIR}${afskerneldir}/cfgexport64
+	@AIX64@${INSTALL_DATA} cfgafs64 ${DESTDIR}${afskerneldir}/cfgafs64

-${DEST}/root.client/usr/vice/etc/dkload/export64.ext: @AIX64@export64.ext
-@AIX64@	${INSTALL} $? $@
+dest: export.ext export.ext.nonfs export.exp export64.exp cfgexport \
+		cfgafs $(EXPORTS64)
+	${INSTALL} -d ${DEST}/root.client/usr/vice/etc/dkload
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} export.ext ${DEST}/root.client/usr/vice/etc/dkload/export.ext
+	${INSTALL_DATA} export.ext.nonfs ${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs
+	${INSTALL_DATA} export.exp ${DEST}/lib/afs/export.exp
+	${INSTALL_DATA} ${srcdir}/extras.exp ${DEST}/lib/afs/extras.exp
+	${INSTALL_DATA} cfgexport ${DEST}/root.client/usr/vice/etc/dkload/cfgexport
+	${INSTALL_DATA} cfgafs ${DEST}/root.client/usr/vice/etc/dkload/cfgafs
+	@AIX64@${INSTALL_DATA} export64.ext.nonfs ${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs \
+	@AIX64@${INSTALL_DATA} export64.exp ${DEST}/lib/afs/export64.exp \
+	@AIX64@${INSTALL_DATA} export64.ext ${DEST}/root.client/usr/vice/etc/dkload/export64.ext \
+	@AIX64@${INSTALL_DATA} cfgexport64 ${DEST}/root.client/usr/vice/etc/dkload/cfgexport64 \
+	@AIX64@${INSTALL_DATA} cfgafs64 ${DEST}/root.client/usr/vice/etc/dkload/cfgafs64

-${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs: export.ext.nonfs
-	${INSTALL} $? $@
-
-${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs: @AIX64@export64.ext.nonfs
-@AIX64@	${INSTALL} $? $@
-
-${DESTDIR}${afskerneldir}/export.ext: export.ext
-	${INSTALL} $? $@
-
-${DESTDIR}${afskerneldir}/export64.ext: @AIX64@export64.ext
-@AIX64@	${INSTALL} $? $@
-
-${DESTDIR}${afskerneldir}/export.ext.nonfs: export.ext.nonfs
-	${INSTALL} $? $@
-
-${DESTDIR}${afskerneldir}/export64.ext.nonfs: @AIX64@export64.ext.nonfs
-@AIX64@	${INSTALL} $? $@
-
-${DEST}/lib/afs/export.exp: export.exp
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/export64.exp: export64.exp
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/export.exp: export.exp
-	${INSTALL} $? $@ 
-
-${DESTDIR}${libdir}/afs/export64.exp: export64.exp
-	${INSTALL} $? $@ 
-
-${TOP_LIBDIR}/export.exp: export.exp
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/export64.exp: export64.exp
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/extras.exp: ${srcdir}/extras.exp
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/extras.exp: ${srcdir}/extras.exp
-	${INSTALL} $? $@
-
-
-${TOP_LIBDIR}/extras.exp: ${srcdir}/extras.exp
-	${INSTALL} $? $@
-
-
-${DEST}/root.client/usr/vice/etc/dkload/cfgexport: cfgexport
-	${INSTALL} $? $@
-
-${DEST}/root.client/usr/vice/etc/dkload/cfgexport64: @AIX64@cfgexport64
-@AIX64@	${INSTALL} $? $@
-
-${DEST}/root.client/usr/vice/etc/dkload/cfgafs: cfgafs
-	${INSTALL} $? $@
-
-${DEST}/root.client/usr/vice/etc/dkload/cfgafs64: @AIX64@cfgafs64
-@AIX64@	${INSTALL} $? $@
-
-${DESTDIR}${afskerneldir}/cfgexport: cfgexport
-	${INSTALL} $? $@
-
-${DESTDIR}${afskerneldir}/cfgexport64: @AIX64@cfgexport64
-@AIX64@	${INSTALL} $? $@
-
-${DESTDIR}${afskerneldir}/cfgafs: cfgafs
-	${INSTALL} $? $@
-
-${DESTDIR}${afskerneldir}/cfgafs64: @AIX64@cfgafs64
-@AIX64@	${INSTALL} $? $@
-
-dest:    ${DEST}/root.client/usr/vice/etc/dkload/export.ext \
-	${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs \
-	${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs \
-	${DEST}/lib/afs/export.exp \
-	${DEST}/lib/afs/export64.exp \
-	${DEST}/lib/afs/extras.exp \
-	${DEST}/root.client/usr/vice/etc/dkload/cfgexport \
-	${DEST}/root.client/usr/vice/etc/dkload/cfgafs \
-	${DEST}/root.client/usr/vice/etc/dkload/export64.ext \
-	${DEST}/root.client/usr/vice/etc/dkload/cfgexport64 \
-	${DEST}/root.client/usr/vice/etc/dkload/cfgafs64 
+include ../config/Makefile.version
--- a/src/finale/Makefile.in
+++ b/src/finale/Makefile.in
@ -64,10 +64,14 @@ test: translate_et
 #
 # Install targets
 #
-install: ${DESTDIR}${bindir}/translate_et
+install:
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL_PROGRAM} translate_et ${DESTDIR}${bindir}/translate_et
+
+dest:
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL_PROGRAM} translate_et ${DEST}/bin/translate_et

-${DEST}/bin/translate_et: translate_et
-	${INSTALL} $? $@

 #
 # Misc. targets
@ -77,9 +81,3 @@ clean:
 	$(RM) -f *.o translate_et core AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${bindir}/translate_et: translate_et
-	${INSTALL} $? $@
-
-dest: ${DEST}/bin/translate_et
-
--- a/src/fsint/Makefile.in
+++ b/src/fsint/Makefile.in
@ -21,6 +21,18 @@ depinstall: \
 	Kpagcb.ss.c Kpagcb.h Kpagcb.cs.c Kpagcb.xdr.c \
        afscbint.h afsint.h pagcb.h

+${TOP_LIBDIR}/libafsint.a: libafsint.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/afsint.h: afsint.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/afscbint.h: afscbint.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/pagcb.h: pagcb.h
+	${INSTALL_DATA} $? $@
+
 libafsint.a: ${OBJS} AFS_component_version_number.o
 	-$(RM) -f $@
 	$(AR) crv $@ ${OBJS} AFS_component_version_number.o
@ -94,45 +106,21 @@ afscbint.h: common.xg afscbint.xg
 #
 # Installation targets
 #
-${TOP_LIBDIR}/libafsint.a: libafsint.a
-	${INSTALL} $? $@
+install: libafsint.a afsint.h afscbint.h pagcb.h
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libafsint.a ${DESTDIR}${libdir}/afs/libafsint.a
+	${INSTALL_DATA} afsint.h ${DESTDIR}${includedir}/afs/afsint.h
+	${INSTALL_DATA} afscbint.h ${DESTDIR}${includedir}/afs/afscbint.h
+	${INSTALL_DATA} pagcb.h ${DESTDIR}${includedir}/afs/pagcb.h

-${TOP_INCDIR}/afs/afsint.h: afsint.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/afscbint.h: afscbint.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/pagcb.h: pagcb.h
-	${INSTALL} $? $@
-
-install: \
-	${DESTDIR}${libdir}/afs/libafsint.a \
-	${DESTDIR}${includedir}/afs/afsint.h \
-	${DESTDIR}${includedir}/afs/afscbint.h
-
-${DESTDIR}${libdir}/afs/libafsint.a: libafsint.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afsint.h: afsint.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afscbint.h: afscbint.h
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/lib/afs/libafsint.a \
-	${DEST}/include/afs/afsint.h \
-	${DEST}/include/afs/afscbint.h
-
-${DEST}/lib/afs/libafsint.a: libafsint.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afscbint.h: afscbint.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afsint.h: afsint.h
-	${INSTALL} $? $@
+dest: libafsint.a afsint.h afscbint.h pagcb.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libafsint.a ${DEST}/lib/afs/libafsint.a
+	${INSTALL_DATA} afsint.h ${DEST}/include/afs/afsint.h
+	${INSTALL_DATA} afscbint.h ${DEST}/include/afs/afscbint.h
+	${INSTALL_DATA} pagcb.h ${DEST}/include/afs/pagcb.h

 #
 # Misc targets
@ -144,4 +132,3 @@ clean:
 	Kvice.h Kcallback.h Kpagcb.h

 include ../config/Makefile.version
-
--- a/src/fsprobe/Makefile.in
+++ b/src/fsprobe/Makefile.in
@ -27,6 +27,12 @@ LIBS=${TOP_LIBDIR}/libvolser.a ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/libacl.a \

 all: ${TOP_INCDIR}/afs/fsprobe.h ${TOP_LIBDIR}/libfsprobe.a fsprobe_test

+${TOP_INCDIR}/afs/fsprobe.h: fsprobe.h
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libfsprobe.a: libfsprobe.a
+	${INSTALL_DATA} $? $@
+
 #
 # Build targets
 #
@ -46,13 +52,17 @@ fsprobe_test: fsprobe_test.o libfsprobe.a ${LIBS}
 #
 # Install targets
 #
-install: ${DESTDIR}${includedir}/afs/fsprobe.h ${DESTDIR}${libdir}/afs/libfsprobe.a 
+install: fsprobe.h libfsprobe.a
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} fsprobe.h ${DESTDIR}${includedir}/afs/fsprobe.h
+	${INSTALL_DATA} libfsprobe.a ${DESTDIR}${libdir}/afs/libfsprobe.a 

-${DEST}/include/afs/fsprobe.h: fsprobe.h
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libfsprobe.a: libfsprobe.a
-	${INSTALL} $? $@
+dest: fsprobe.h libfsprobe.a
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} fsprobe.h ${DEST}/include/afs/fsprobe.h
+	${INSTALL_DATA} libfsprobe.a ${DEST}/lib/afs/libfsprobe.a 

 #
 # Misc others
@ -61,18 +71,3 @@ clean:
 	$(RM) -f *.o fsprobe_test libfsprobe.a core AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${includedir}/afs/fsprobe.h: fsprobe.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/fsprobe.h: fsprobe.h
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libfsprobe.a: libfsprobe.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libfsprobe.a: libfsprobe.a
-	${INSTALL} $? $@
-
-dest: ${DEST}/include/afs/fsprobe.h ${DEST}/lib/afs/libfsprobe.a 
-
--- a/src/gtx/Makefile.in
+++ b/src/gtx/Makefile.in
@ -83,6 +83,45 @@ all: gtxtest \
 	${TOP_INCDIR}/afs/gtxwindows.h \
 	${TOP_INCDIR}/afs/gtxX11win.h

+${TOP_LIBDIR}/libgtx.a: libgtx.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxcurseswin.h: gtxcurseswin.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxdumbwin.h: gtxdumbwin.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxframe.h: gtxframe.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxinput.h: gtxinput.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxkeymap.h: gtxkeymap.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxlightobj.h: gtxlightobj.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxobjdict.h: gtxobjdict.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxobjects.h: gtxobjects.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxtextcb.h: gtxtextcb.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxtextobj.h: gtxtextobj.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxwindows.h: gtxwindows.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/gtxX11win.h: gtxX11win.h
+	${INSTALL_DATA} $? $@
+
 tests: object_test screen_test curses_test cb_test gtxtest

 # All objects in the library
@ -148,154 +187,39 @@ libgtx.a: ${LIBOBJS} AFS_component_version_number.o
 	$(AR) crv $@ ${LIBOBJS} AFS_component_version_number.o
 	${RANLIB} $@

-install: \
-	${DESTDIR}${libdir}/afs/libgtx.a \
-	${DESTDIR}${includedir}/afs/gtxcurseswin.h \
-	${DESTDIR}${includedir}/afs/gtxdumbwin.h \
-	${DESTDIR}${includedir}/afs/gtxframe.h \
-	${DESTDIR}${includedir}/afs/gtxinput.h \
-	${DESTDIR}${includedir}/afs/gtxkeymap.h \
-	${DESTDIR}${includedir}/afs/gtxlightobj.h \
-	${DESTDIR}${includedir}/afs/gtxobjdict.h \
-	${DESTDIR}${includedir}/afs/gtxobjects.h \
-	${DESTDIR}${includedir}/afs/gtxtextcb.h \
-	${DESTDIR}${includedir}/afs/gtxtextobj.h \
-	${DESTDIR}${includedir}/afs/gtxwindows.h \
-	${DESTDIR}${includedir}/afs/gtxX11win.h
-
-${DESTDIR}${libdir}/afs/libgtx.a: libgtx.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxcurseswin.h: gtxcurseswin.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxdumbwin.h: gtxdumbwin.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxframe.h: gtxframe.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxinput.h: gtxinput.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxkeymap.h: gtxkeymap.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxlightobj.h: gtxlightobj.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxobjdict.h: gtxobjdict.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxobjects.h: gtxobjects.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxtextcb.h: gtxtextcb.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxtextobj.h: gtxtextobj.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxwindows.h: gtxwindows.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/gtxX11win.h: gtxX11win.h
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/lib/afs/libgtx.a \
-	${DEST}/include/afs/gtxcurseswin.h \
-	${DEST}/include/afs/gtxdumbwin.h \
-	${DEST}/include/afs/gtxframe.h \
-	${DEST}/include/afs/gtxinput.h \
-	${DEST}/include/afs/gtxkeymap.h \
-	${DEST}/include/afs/gtxlightobj.h \
-	${DEST}/include/afs/gtxobjdict.h \
-	${DEST}/include/afs/gtxobjects.h \
-	${DEST}/include/afs/gtxtextcb.h \
-	${DEST}/include/afs/gtxtextobj.h \
-	${DEST}/include/afs/gtxwindows.h \
-	${DEST}/include/afs/gtxX11win.h
-
-${DEST}/lib/afs/libgtx.a: libgtx.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxcurseswin.h: gtxcurseswin.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxdumbwin.h: gtxdumbwin.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxframe.h: gtxframe.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxinput.h: gtxinput.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxkeymap.h: gtxkeymap.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxlightobj.h: gtxlightobj.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxobjdict.h: gtxobjdict.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxobjects.h: gtxobjects.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxtextcb.h: gtxtextcb.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxtextobj.h: gtxtextobj.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxwindows.h: gtxwindows.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/gtxX11win.h: gtxX11win.h
-	${INSTALL} $? $@
-
-
-${TOP_LIBDIR}/libgtx.a: libgtx.a
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxcurseswin.h: gtxcurseswin.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxdumbwin.h: gtxdumbwin.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxframe.h: gtxframe.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxinput.h: gtxinput.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxkeymap.h: gtxkeymap.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxlightobj.h: gtxlightobj.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxobjdict.h: gtxobjdict.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxobjects.h: gtxobjects.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxtextcb.h: gtxtextcb.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxtextobj.h: gtxtextobj.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxwindows.h: gtxwindows.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/gtxX11win.h: gtxX11win.h
-	${INSTALL} $? $@
+install: libgtx.a
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libgtx.a ${DESTDIR}${libdir}/afs/libgtx.a
+	${INSTALL_DATA} gtxcurseswin.h ${DESTDIR}${includedir}/afs/gtxcurseswin.h
+	${INSTALL_DATA} gtxdumbwin.h ${DESTDIR}${includedir}/afs/gtxdumbwin.h
+	${INSTALL_DATA} gtxframe.h ${DESTDIR}${includedir}/afs/gtxframe.h
+	${INSTALL_DATA} gtxinput.h ${DESTDIR}${includedir}/afs/gtxinput.h
+	${INSTALL_DATA} gtxkeymap.h ${DESTDIR}${includedir}/afs/gtxkeymap.h
+	${INSTALL_DATA} gtxlightobj.h ${DESTDIR}${includedir}/afs/gtxlightobj.h
+	${INSTALL_DATA} gtxobjdict.h ${DESTDIR}${includedir}/afs/gtxobjdict.h
+	${INSTALL_DATA} gtxobjects.h ${DESTDIR}${includedir}/afs/gtxobjects.h
+	${INSTALL_DATA} gtxtextcb.h ${DESTDIR}${includedir}/afs/gtxtextcb.h
+	${INSTALL_DATA} gtxtextobj.h ${DESTDIR}${includedir}/afs/gtxtextobj.h
+	${INSTALL_DATA} gtxwindows.h ${DESTDIR}${includedir}/afs/gtxwindows.h
+	${INSTALL_DATA} gtxX11win.h ${DESTDIR}${includedir}/afs/gtxX11win.h

+dest: libgtx.a
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libgtx.a ${DEST}/lib/afs/libgtx.a
+	${INSTALL_DATA} gtxcurseswin.h ${DEST}/include/afs/gtxcurseswin.h
+	${INSTALL_DATA} gtxdumbwin.h ${DEST}/include/afs/gtxdumbwin.h
+	${INSTALL_DATA} gtxframe.h ${DEST}/include/afs/gtxframe.h
+	${INSTALL_DATA} gtxinput.h ${DEST}/include/afs/gtxinput.h
+	${INSTALL_DATA} gtxkeymap.h ${DEST}/include/afs/gtxkeymap.h
+	${INSTALL_DATA} gtxlightobj.h ${DEST}/include/afs/gtxlightobj.h
+	${INSTALL_DATA} gtxobjdict.h ${DEST}/include/afs/gtxobjdict.h
+	${INSTALL_DATA} gtxobjects.h ${DEST}/include/afs/gtxobjects.h
+	${INSTALL_DATA} gtxtextcb.h ${DEST}/include/afs/gtxtextcb.h
+	${INSTALL_DATA} gtxtextobj.h ${DEST}/include/afs/gtxtextobj.h
+	${INSTALL_DATA} gtxwindows.h ${DEST}/include/afs/gtxwindows.h
+	${INSTALL_DATA} gtxX11win.h ${DEST}/include/afs/gtxX11win.h

 #
 # Misc targets
@ -304,5 +228,3 @@ clean:
 	$(RM) -f  *.o *.a *.ln object_test screen_test curses_test core cb_test gtxtest AFS_component_version_number.c

 include ../config/Makefile.version
-
-
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@ -51,7 +51,6 @@ KLIBS=${TOP_LIBDIR}/libubik.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

-
 all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb ka-forwarder \
 	${TOP_LIBDIR}/libkauth.a \
 	${TOP_LIBDIR}/libkauth.krb.a \
@ -63,6 +62,21 @@ depinstall: \
 	${TOP_INCDIR}/afs/kauth.h \
 	${TOP_INCDIR}/afs/kaport.h 

+${TOP_LIBDIR}/libkauth.a: libkauth.a
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libkauth.krb.a: libkauth.krb.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/kautils.h: kautils.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/kauth.h: kauth.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/kaport.h: kaport.h
+	${INSTALL_DATA} $? $@
+
 test tests: all
 	cd test; $(MAKE)

@ -211,178 +225,73 @@ rebuild: rebuild.o kautils.o $(LIBS)
 #
 # Install targets
 #
-${TOP_LIBDIR}/libkauth.a: libkauth.a
-	${INSTALL} $? $@
+install: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \
+		libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \
+		kaport.h
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL} -d ${DESTDIR}${afssrvbindir}
+	${INSTALL} -d ${DESTDIR}${afssrvsbindir}
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_PROGRAM} kaserver ${DESTDIR}${afssrvlibexecdir}/kaserver
+	${INSTALL_PROGRAM} kas ${DESTDIR}${sbindir}/kas
+	${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${sbindir}/kpwvalid
+	${INSTALL_PROGRAM} kas ${DESTDIR}${afssrvsbindir}/kas
+	${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${afssrvsbindir}/kpwvalid
+	${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog
+	${INSTALL_PROGRAM} klog.krb ${DESTDIR}${bindir}/klog.krb
+	${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog
+	${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb
+	${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs
+	${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd
+	${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid
+	${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a
+	${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a
+	${INSTALL_PROGRAM} rebuild ${DESTDIR}${afssrvsbindir}/kadb_check
+	${INSTALL_PROGRAM} kdb ${DESTDIR}${afssrvsbindir}/kdb
+	${INSTALL_PROGRAM} ka-forwarder ${DESTDIR}${afssrvsbindir}/ka-forwarder
+	${INSTALL_DATA} kautils.h ${DESTDIR}${includedir}/afs/kautils.h
+	${INSTALL_DATA} kauth.h ${DESTDIR}${includedir}/afs/kauth.h
+	${INSTALL_DATA} kaport.h ${DESTDIR}${includedir}/afs/kaport.h

-${TOP_LIBDIR}/libkauth.krb.a: libkauth.krb.a
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/kautils.h: kautils.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/kauth.h: kauth.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/kaport.h: kaport.h
-	${INSTALL} $? $@
-
-install: \
-	${DESTDIR}${afssrvlibexecdir}/kaserver \
-	${DESTDIR}${sbindir}/kas \
-	${DESTDIR}${sbindir}/kpwvalid \
-	${DESTDIR}${afssrvsbindir}/kas \
-	${DESTDIR}${afssrvsbindir}/kpwvalid \
-	${DESTDIR}${bindir}/klog \
-	${DESTDIR}${bindir}/klog.krb \
-	${DESTDIR}${afssrvbindir}/klog \
-	${DESTDIR}${afssrvbindir}/klog.krb \
-	${DESTDIR}${bindir}/knfs \
-	${DESTDIR}${bindir}/kpasswd \
-	${DESTDIR}${bindir}/kpwvalid \
-	${DESTDIR}${libdir}/afs/libkauth.a \
-	${DESTDIR}${libdir}/afs/libkauth.krb.a \
-	${DESTDIR}${afssrvsbindir}/kadb_check \
-	${DESTDIR}${afssrvsbindir}/kdb \
-	${DESTDIR}${afssrvsbindir}/ka-forwarder \
-	${DESTDIR}${includedir}/afs/kautils.h \
-	${DESTDIR}${includedir}/afs/kauth.h \
-	${DESTDIR}${includedir}/afs/kaport.h
-
-${DESTDIR}${afssrvlibexecdir}/kaserver: kaserver
-	${INSTALL} -s $? $@
-
-${DESTDIR}${sbindir}/kas: kas
-	${INSTALL} -s $? $@
-
-${DESTDIR}${sbindir}/kpwvalid: kpwvalid
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/kas: kas
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvsbindir}/kpwvalid: kpwvalid
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/klog: klog
-	${INSTALL} -s $? $@
-
-${DESTDIR}${bindir}/klog.krb: klog.krb
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvbindir}/klog: klog
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvbindir}/klog.krb: klog.krb
-	${INSTALL} -s $? $@
-
-${DESTDIR}${bindir}/knfs: knfs
-	${INSTALL} -s $? $@
-
-${DESTDIR}${bindir}/kpasswd: kpasswd
-	${INSTALL} -s $? $@
-
-${DESTDIR}${bindir}/kpwvalid: kpwvalid
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libkauth.a: libkauth.a
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libkauth.krb.a: libkauth.krb.a
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/kadb_check: rebuild
-	${INSTALL} -f $? $@
-
-${DESTDIR}${afssrvsbindir}/kdb: kdb
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvsbindir}/ka-forwarder: ka-forwarder
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/kautils.h: kautils.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/kauth.h: kauth.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/kaport.h: kaport.h
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/root.server/usr/afs/bin/kaserver \
-	${DEST}/etc/kas \
-	${DEST}/etc/kpwvalid \
-	${DEST}/root.server/usr/afs/bin/kas \
-	${DEST}/root.server/usr/afs/bin/kpwvalid \
-	${DEST}/bin/klog \
-	${DEST}/bin/klog.krb \
-	${DEST}/root.server/usr/afs/bin/klog \
-	${DEST}/root.server/usr/afs/bin/klog.krb \
-	${DEST}/bin/knfs \
-	${DEST}/bin/kpasswd \
-	${DEST}/bin/kpwvalid \
-	${DEST}/lib/afs/libkauth.a \
-	${DEST}/lib/afs/libkauth.krb.a \
-	${DEST}/etc/kdb \
-	${DEST}/etc/kadb_check \
-	${DEST}/root.server/usr/afs/bin/ka-forwarder \
-	${DEST}/include/afs/kautils.h \
-	${DEST}/include/afs/kauth.h \
-	${DEST}/include/afs/kaport.h
-
-${DEST}/root.server/usr/afs/bin/kaserver: kaserver
-	${INSTALL} -s $? $@
-
-${DEST}/etc/kas ${DEST}/root.server/usr/afs/bin/kas: kas 
-	${INSTALL} -s $? $@
-
-${DEST}/bin/kpwvalid ${DEST}/etc/kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid: kpwvalid 
-	${INSTALL} $? $@
-
-${DEST}/bin/klog ${DEST}/root.server/usr/afs/bin/klog: klog 
-	${INSTALL} -s $? $@
-
-${DEST}/bin/klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb: klog.krb 
-	${INSTALL} -s $? $@
-
-${DEST}/bin/knfs: knfs 
-	${INSTALL} -s $? $@
-
-${DEST}/bin/kpasswd: kpasswd 
-	${INSTALL} -s $? $@
-
-${DEST}/lib/afs/libkauth.a: libkauth.a 
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libkauth.krb.a: libkauth.krb.a 
-	${INSTALL} $? $@
-
-${DEST}/etc/kadb_check: rebuild
-	${INSTALL} -f $? $@
-
-${DEST}/etc/kdb: kdb 
-	${INSTALL} -s $? $@
-
-${DEST}/root.server/usr/afs/bin/ka-forwarder: ka-forwarder
-	${INSTALL} $? $@
-
-${DEST}/include/afs/kautils.h: kautils.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/kauth.h: kauth.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/kaport.h: kaport.h
-	${INSTALL} $? $@
+dest: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \
+		libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \
+		kaport.h
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_PROGRAM} kaserver ${DEST}/root.server/usr/afs/bin/kaserver
+	${INSTALL_PROGRAM} kas ${DEST}/etc/kas
+	${INSTALL_PROGRAM} kpwvalid ${DEST}/etc/kpwvalid
+	${INSTALL_PROGRAM} kas ${DEST}/root.server/usr/afs/bin/kas
+	${INSTALL_PROGRAM} kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid
+	${INSTALL_PROGRAM} klog ${DEST}/bin/klog
+	${INSTALL_PROGRAM} klog.krb ${DEST}/bin/klog.krb
+	${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog
+	${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb
+	${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs
+	${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd
+	${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid
+	${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a
+	${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a
+	${INSTALL_PROGRAM} kdb ${DEST}/etc/kdb
+	${INSTALL_PROGRAM} rebuild ${DEST}/etc/kadb_check
+	${INSTALL_PROGRAM} ka-forwarder ${DEST}/root.server/usr/afs/bin/ka-forwarder
+	${INSTALL_DATA} kautils.h ${DEST}/include/afs/kautils.h
+	${INSTALL_DATA} kauth.h ${DEST}/include/afs/kauth.h
+	${INSTALL_DATA} kaport.h ${DEST}/include/afs/kaport.h

 #
 # Misc. targets
 #
-include ../config/Makefile.version
-
 clean:
 	$(RM) -f *.o *.a *.xdr.c *.cs.c *.ss.c core \
 		kaserver kas klog multiklog kpasswd klogin rebuild \
 		kauth.h kautils.h kaerrors.c kpwvalid AFS_component_version_number.c \
 		klog.krb knfs klogin.krb kdb Kkauth.h

+include ../config/Makefile.version
--- a/src/libacl/Makefile.in
+++ b/src/libacl/Makefile.in
@ -19,6 +19,15 @@ depinstall: \
 	${TOP_INCDIR}/afs/acl.h \
 	${TOP_INCDIR}/afs/prs_fs.h 

+${TOP_LIBDIR}/libacl.a: libacl.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/acl.h: acl.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/prs_fs.h: prs_fs.h
+	${INSTALL_DATA} $? $@
+
 libacl.a: aclprocs.o netprocs.o AFS_component_version_number.o
 	$(RM) -f $@
 	$(AR) crv $@ aclprocs.o netprocs.o AFS_component_version_number.o
@ -31,43 +40,19 @@ netprocs.o: netprocs.c acl.h
 #
 # Installation targets
 #
+install: libacl.a acl.h prs_fs.h
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libacl.a ${DESTDIR}${libdir}/afs/libacl.a
+	${INSTALL_DATA} acl.h ${DESTDIR}${includedir}/afs/acl.h
+	${INSTALL_DATA} prs_fs.h ${DESTDIR}${includedir}/afs/prs_fs.h

-${TOP_LIBDIR}/libacl.a: libacl.a
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/acl.h: acl.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/prs_fs.h: prs_fs.h
-	${INSTALL} $? $@
-
-install: \
-	${DESTDIR}${libdir}/afs/libacl.a \
-	${DESTDIR}${includedir}/afs/acl.h \
-	${DESTDIR}${includedir}/afs/prs_fs.h
-
-${DESTDIR}${libdir}/afs/libacl.a: libacl.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/acl.h: acl.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/prs_fs.h: prs_fs.h
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/afs/libacl.a \
-	${DEST}/include/afs/acl.h \
-	${DEST}/include/afs/prs_fs.h
-
-${DEST}/lib/afs/libacl.a: libacl.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/acl.h: acl.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/prs_fs.h: prs_fs.h
-	${INSTALL} $? $@
-
+dest: libacl.a acl.h prs_fs.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libacl.a ${DEST}/lib/afs/libacl.a
+	${INSTALL_DATA} acl.h ${DEST}/include/afs/acl.h
+	${INSTALL_DATA} prs_fs.h ${DEST}/include/afs/prs_fs.h

 #
 # Misc. targets
@ -79,5 +64,3 @@ clean:
 	$(RM) -f acltest *.o *.a core AFS_component_version_number.c

 include ../config/Makefile.version
-
-
--- a/src/libadmin/Makefile.in
+++ b/src/libadmin/Makefile.in
@ -10,18 +10,15 @@ include @TOP_OBJDIR@/src/config/Makefile.config

 all: ${TOP_INCDIR}/afs/afs_Admin.h

-install: ${DESTDIR}${includedir}/afs/afs_Admin.h
-
-${DEST}/include/afs/afs_Admin.h: afs_Admin.h
-	${INSTALL} $? $@
-
-clean:
-
-${DESTDIR}${includedir}/afs/afs_Admin.h: afs_Admin.h
-	${INSTALL} $? $@
-
 ${TOP_INCDIR}/afs/afs_Admin.h: afs_Admin.h
 	${INSTALL} $? $@

-dest: ${DEST}/include/afs/afs_Admin.h
+install:
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} afs_Admin.h ${DESTDIR}${includedir}/afs/afs_Admin.h

+dest:
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} afs_Admin.h ${DEST}/include/afs/afs_Admin.h
+
+clean:
--- a/src/libadmin/adminutil/Makefile.in
+++ b/src/libadmin/adminutil/Makefile.in
@ -23,6 +23,12 @@ VOLSER = ../../volser

 all: ${TOP_LIBDIR}/libafsadminutil.a ${TOP_INCDIR}/afs/afs_utilAdmin.h

+${TOP_LIBDIR}/libafsadminutil.a: libafsadminutil.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/afs_utilAdmin.h: afs_utilAdmin.h
+	${INSTALL_DATA} $? $@
+
 afs_AdminBosErrors.c ${DESTDIR}/include/afs/afs_AdminBosErrors.h: afs_AdminBosErrors.et
 	${INSTALL} ${srcdir}/afs_AdminErrors.h ${TOP_INCDIR}/afs
 	$(RM) -f afs_AdminBosErrors.c afs_AdminBosErrors.h
@ -33,37 +39,37 @@ afs_AdminCfgErrors.c ${DESTDIR}/include/afs/afs_AdminCfgErrors.h: afs_AdminCfgEr
 	$(RM) -f ${srcdir}/afs_AdminCfgErrors.c afs_AdminCfgErrors.h
 	${COMPILE_ET} -p ${srcdir} afs_AdminCfgErrors.et -h afs_AdminCfgErrors
 	cp afs_AdminCfgErrors.h ${TOP_INCDIR}/afs/afs_AdminCfgErrors.h
- 
+
 afs_AdminClientErrors.c ${DESTDIR}/include/afs/afs_AdminClientErrors.h: afs_AdminClientErrors.et
 	$(RM) -f ${srcdir}/afs_AdminClientErrors.c afs_AdminClientErrors.h
 	${COMPILE_ET} -p ${srcdir} afs_AdminClientErrors.et -h afs_AdminClientErrors
 	cp afs_AdminClientErrors.h ${TOP_INCDIR}/afs/afs_AdminClientErrors.h
- 
+
 afs_AdminMiscErrors.c ${DESTDIR}/include/afs/afs_AdminMiscErrors.h: afs_AdminMiscErrors.et
 	$(RM) -f ${srcdir}/afs_AdminMiscErrors.c afs_AdminMiscErrors.h
 	${COMPILE_ET} -p ${srcdir} afs_AdminMiscErrors.et -h afs_AdminMiscErrors
 	cp afs_AdminMiscErrors.h ${TOP_INCDIR}/afs/afs_AdminMiscErrors.h
- 
+
 afs_AdminCommonErrors.c ${DESTDIR}/include/afs/afs_AdminCommonErrors.h: afs_AdminCommonErrors.et
 	$(RM) -f ${srcdir}/afs_AdminCommonErrors.c afs_AdminCommonErrors.h
 	${COMPILE_ET} -p ${srcdir} afs_AdminCommonErrors.et -h afs_AdminCommonErrors
 	cp afs_AdminCommonErrors.h ${TOP_INCDIR}/afs/afs_AdminCommonErrors.h
- 
+
 afs_AdminKasErrors.c ${DESTDIR}/include/afs/afs_AdminKasErrors.h: afs_AdminKasErrors.et
 	$(RM) -f ${srcdir}/afs_AdminKasErrors.c afs_AdminKasErrors.h
 	${COMPILE_ET} -p ${srcdir} afs_AdminKasErrors.et -h afs_AdminKasErrors
 	cp afs_AdminKasErrors.h ${TOP_INCDIR}/afs/afs_AdminKasErrors.h
- 
+
 afs_AdminPtsErrors.c ${DESTDIR}/include/afs/afs_AdminPtsErrors.h: afs_AdminPtsErrors.et
 	$(RM) -f ${srcdir}/afs_AdminPtsErrors.c afs_AdminPtsErrors.h
 	${COMPILE_ET} -p ${srcdir} afs_AdminPtsErrors.et -h afs_AdminPtsErrors
 	cp afs_AdminPtsErrors.h ${TOP_INCDIR}/afs/afs_AdminPtsErrors.h
- 
+
 afs_AdminUtilErrors.c ${DESTDIR}/include/afs/afs_AdminUtilErrors.h: afs_AdminUtilErrors.et
 	$(RM) -f ${srcdir}/afs_AdminUtilErrors.c afs_AdminUtilErrors.h
 	${COMPILE_ET} -p ${srcdir} afs_AdminUtilErrors.et -h afs_AdminUtilErrors
 	cp afs_AdminUtilErrors.h ${TOP_INCDIR}/afs/afs_AdminUtilErrors.h
- 
+
 afs_AdminVosErrors.c ${DESTDIR}/include/afs/afs_AdminVosErrors.h: afs_AdminVosErrors.et
 	$(RM) -f ${srcdir}/afs_AdminVosErrors.c afs_AdminVosErrors.h
 	${COMPILE_ET} -p ${srcdir} afs_AdminVosErrors.et -h afs_AdminVosErrors
@ -95,27 +101,17 @@ ADMINOBJS = \

 LIBOBJS = ${ADMINOBJS} ${ERROROBJS}

-install: ${DESTDIR}${libdir}/afs/libafsadminutil.a ${DESTDIR}${includedir}/afs/afs_utilAdmin.h
+install: libafsadminutil.a afs_utilAdmin.h
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libafsadminutil.a ${DESTDIR}${libdir}/afs/libafsadminutil.a
+	${INSTALL_DATA} afs_utilAdmin.h ${DESTDIR}${includedir}/afs/afs_utilAdmin.h

-dest: ${DEST}/lib/afs/libafsadminutil.a ${DEST}/include/afs/afs_utilAdmin.h
-
-${DESTDIR}${libdir}/afs/libafsadminutil.a: libafsadminutil.a
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libafsadminutil.a: libafsadminutil.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libafsadminutil.a: libafsadminutil.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_utilAdmin.h: afs_utilAdmin.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs_utilAdmin.h: afs_utilAdmin.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/afs_utilAdmin.h: afs_utilAdmin.h
-	${INSTALL} $? $@
+dest: libafsadminutil.a afs_utilAdmin.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libafsadminutil.a ${DEST}/lib/afs/libafsadminutil.a
+	${INSTALL_DATA} afs_utilAdmin.h ${DEST}/include/afs/afs_utilAdmin.h

 libafsadminutil.a: ${LIBOBJS}
 	-$(RM) -f $@
--- a/src/libadmin/bos/Makefile.in
+++ b/src/libadmin/bos/Makefile.in
@ -22,29 +22,23 @@ LIBOBJS = ${ADMINOBJS} ${BOZOOBJS}

 all: ${TOP_INCDIR}/afs/afs_bosAdmin.h ${TOP_LIBDIR}/libbosadmin.a

-install: ${DESTDIR}${includedir}/afs/afs_bosAdmin.h ${DESTDIR}${libdir}/afs/libbosadmin.a
-
-dest: ${DEST}/include/afs/afs_bosAdmin.h ${DEST}/lib/afs/libbosadmin.a
-
 ${TOP_INCDIR}/afs/afs_bosAdmin.h: afs_bosAdmin.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs_bosAdmin.h: afs_bosAdmin.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_bosAdmin.h: afs_bosAdmin.h
-	${INSTALL} $? $@
-
+	${INSTALL_DATA} $? $@

 ${TOP_LIBDIR}/libbosadmin.a: libbosadmin.a
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

-${DEST}/lib/afs/libbosadmin.a: libbosadmin.a
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libbosadmin.a: libbosadmin.a
-	${INSTALL} $? $@
+install: libbosadmin.a afs_bosAdmin.h
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} afs_bosAdmin.h ${DESTDIR}${includedir}/afs/afs_bosAdmin.h
+	${INSTALL_DATA} libbosadmin.a ${DESTDIR}${libdir}/afs/libbosadmin.a

+dest: libbosadmin.a afs_bosAdmin.h
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} afs_bosAdmin.h ${DEST}/include/afs/afs_bosAdmin.h
+	${INSTALL_DATA} libbosadmin.a ${DEST}/lib/afs/libbosadmin.a

 libbosadmin.a: ${LIBOBJS}
 	-$(RM) -f $@
--- a/src/libadmin/cfg/Makefile.in
+++ b/src/libadmin/cfg/Makefile.in
@ -26,30 +26,25 @@ LIBOBJS =\
 	${UBIKOBJS} \
 	${CFGOBJS}

-
 all: ${TOP_INCDIR}/afs/afs_cfgAdmin.h ${TOP_LIBDIR}/libcfgadmin.a

-install: ${DESTDIR}${includedir}/afs/afs_cfgAdmin.h ${DESTDIR}${libdir}/afs/libcfgadmin.a
-
-dest: ${DEST}/include/afs/afs_cfgAdmin.h ${DEST}/lib/afs/libcfgadmin.a
-
 ${TOP_INCDIR}/afs/afs_cfgAdmin.h: afs_cfgAdmin.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_cfgAdmin.h: afs_cfgAdmin.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs_cfgAdmin.h: afs_cfgAdmin.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_LIBDIR}/libcfgadmin.a: libcfgadmin.a
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

-${DESTDIR}${libdir}/afs/libcfgadmin.a: libcfgadmin.a
-	${INSTALL} $? $@
+install: libcfgadmin.a afs_cfgAdmin.h
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} afs_cfgAdmin.h ${DESTDIR}${includedir}/afs/afs_cfgAdmin.h
+	${INSTALL_DATA} libcfgadmin.a ${DESTDIR}${libdir}/afs/libcfgadmin.a

-${DEST}/lib/afs/libcfgadmin.a: libcfgadmin.a
-	${INSTALL} $? $@
+dest: libcfgadmin.a afs_cfgAdmin.h
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} afs_cfgAdmin.h ${DEST}/include/afs/afs_cfgAdmin.h
+	${INSTALL_DATA} libcfgadmin.a ${DEST}/lib/afs/libcfgadmin.a

 libcfgadmin.a: ${LIBOBJS}
 	-$(RM) -f $@
--- a/src/libadmin/client/Makefile.in
+++ b/src/libadmin/client/Makefile.in
@ -17,27 +17,23 @@ LIBOBJS = ${ADMINOBJS}

 all: ${TOP_INCDIR}/afs/afs_clientAdmin.h ${TOP_LIBDIR}/libclientadmin.a

-install: ${DESTDIR}${includedir}/afs/afs_clientAdmin.h ${DESTDIR}${libdir}/afs/libclientadmin.a
-
-dest: ${DEST}/include/afs/afs_clientAdmin.h ${DEST}/lib/afs/libclientadmin.a
-
 ${TOP_INCDIR}/afs/afs_clientAdmin.h: afs_clientAdmin.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_clientAdmin.h: afs_clientAdmin.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs_clientAdmin.h: afs_clientAdmin.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_LIBDIR}/libclientadmin.a: libclientadmin.a
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

-${DESTDIR}${libdir}/afs/libclientadmin.a: libclientadmin.a
-	${INSTALL} $? $@
+install: afs_clientAdmin.h libclientadmin.a
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} afs_clientAdmin.h ${DESTDIR}${includedir}/afs/afs_clientAdmin.h
+	${INSTALL_DATA} libclientadmin.a ${DESTDIR}${libdir}/afs/libclientadmin.a

-${DEST}/lib/afs/libclientadmin.a: libclientadmin.a
-	${INSTALL} $? $@
+dest: afs_clientAdmin.h libclientadmin.a
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} afs_clientAdmin.h ${DEST}/include/afs/afs_clientAdmin.h
+	${INSTALL_DATA} libclientadmin.a ${DEST}/lib/afs/libclientadmin.a

 libclientadmin.a: ${LIBOBJS}
 	-$(RM) -f $@
--- a/src/libadmin/kas/Makefile.in
+++ b/src/libadmin/kas/Makefile.in
@ -25,27 +25,23 @@ LIBOBJS = ${ADMINOBJS} ${KAUTHOBJS}

 all: ${TOP_INCDIR}/afs/afs_kasAdmin.h ${TOP_LIBDIR}/libkasadmin.a

-install: ${DESTDIR}${includedir}/afs/afs_kasAdmin.h ${DESTDIR}${libdir}/afs/libkasadmin.a
-
-dest: ${DEST}/include/afs/afs_kasAdmin.h ${DEST}/lib/afs/libkasadmin.a
-
 ${TOP_INCDIR}/afs/afs_kasAdmin.h: afs_kasAdmin.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_kasAdmin.h: afs_kasAdmin.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs_kasAdmin.h: afs_kasAdmin.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_LIBDIR}/libkasadmin.a: libkasadmin.a
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

-${DESTDIR}${libdir}/afs/libkasadmin.a: libkasadmin.a
-	${INSTALL} $? $@
+install: afs_kasAdmin.h libkasadmin.a
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} afs_kasAdmin.h ${DESTDIR}${includedir}/afs/afs_kasAdmin.h
+	${INSTALL_DATA} libkasadmin.a ${DESTDIR}${libdir}/afs/libkasadmin.a

-${DEST}/lib/afs/libkasadmin.a: libkasadmin.a
-	${INSTALL} $? $@
+dest: afs_kasAdmin.h libkasadmin.a
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} afs_kasAdmin.h ${DEST}/include/afs/afs_kasAdmin.h
+	${INSTALL_DATA} libkasadmin.a ${DEST}/lib/afs/libkasadmin.a

 libkasadmin.a: ${LIBOBJS}
 	-$(RM) -f $@
--- a/src/libadmin/pts/Makefile.in
+++ b/src/libadmin/pts/Makefile.in
@ -25,27 +25,23 @@ LIBOBJS = ${ADMINOBJS} ${PTSERVEROBJS}

 all: ${TOP_INCDIR}/afs/afs_ptsAdmin.h ${TOP_LIBDIR}/libptsadmin.a

-install: ${DESTDIR}${includedir}/afs/afs_ptsAdmin.h ${DESTDIR}${libdir}/afs/libptsadmin.a
-
-dest: ${DEST}/include/afs/afs_ptsAdmin.h ${DEST}/lib/afs/libptsadmin.a
-
 ${TOP_INCDIR}/afs/afs_ptsAdmin.h: afs_ptsAdmin.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_ptsAdmin.h: afs_ptsAdmin.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs_ptsAdmin.h: afs_ptsAdmin.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_LIBDIR}/libptsadmin.a: libptsadmin.a
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

-${DESTDIR}${libdir}/afs/libptsadmin.a: libptsadmin.a
-	${INSTALL} $? $@
+install: afs_ptsAdmin.h libptsadmin.a
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} afs_ptsAdmin.h ${DESTDIR}${includedir}/afs/afs_ptsAdmin.h
+	${INSTALL_DATA} libptsadmin.a ${DESTDIR}${libdir}/afs/libptsadmin.a

-${DEST}/lib/afs/libptsadmin.a: libptsadmin.a
-	${INSTALL} $? $@
+dest: afs_ptsAdmin.h libptsadmin.a
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} afs_ptsAdmin.h ${DEST}/include/afs/afs_ptsAdmin.h
+	${INSTALL_DATA} libptsadmin.a ${DEST}/lib/afs/libptsadmin.a

 libptsadmin.a: ${LIBOBJS}
 	-$(RM) -f $@
--- a/src/libadmin/vos/Makefile.in
+++ b/src/libadmin/vos/Makefile.in
@ -40,29 +40,23 @@ LIBVOSADMIN=${TOP_LIBDIR}/libvosadmin.a

 all: ${TOP_INCDIR}/afs/afs_vosAdmin.h ${TOP_LIBDIR}/libvosadmin.a

-install: ${DESTDIR}${includedir}/afs/afs_vosAdmin.h ${DESTDIR}${libdir}/afs/libvosadmin.a
-
-dest: ${DEST}/include/afs/afs_vosAdmin.h ${DEST}/lib/afs/libvosadmin.a
-
 ${TOP_INCDIR}/afs/afs_vosAdmin.h: afs_vosAdmin.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_vosAdmin.h: afs_vosAdmin.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs_vosAdmin.h: afs_vosAdmin.h
-	${INSTALL} $? $@
-
+	${INSTALL_DATA} $? $@

 ${TOP_LIBDIR}/libvosadmin.a: libvosadmin.a
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

-${DESTDIR}${libdir}/afs/libvosadmin.a: libvosadmin.a
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libvosadmin.a: libvosadmin.a
-	${INSTALL} $? $@
+install: afs_vosAdmin.h libvosadmin.a
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} afs_vosAdmin.h ${DESTDIR}${includedir}/afs/afs_vosAdmin.h
+	${INSTALL_DATA} libvosadmin.a ${DESTDIR}${libdir}/afs/libvosadmin.a

+dest: afs_vosAdmin.h libvosadmin.a
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} afs_vosAdmin.h ${DEST}/include/afs/afs_vosAdmin.h
+	${INSTALL_DATA} libvosadmin.a ${DEST}/lib/afs/libvosadmin.a

 libvosadmin.a: ${LIBOBJS}
 	-$(RM) -f $@
--- a/src/libafs/MakefileProto.AIX.in
+++ b/src/libafs/MakefileProto.AIX.in
@ -124,16 +124,33 @@ aix_instdirs_afs.ext.64: install_afs.ext.64
 aix_destdirs_afs.ext.32: dest_afs.ext.32
 aix_destdirs_afs.ext.64: dest_afs.ext.64

-dest_afs.ext.32: $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32
+dest_afs.ext.32: afs.ext.32
+	${INSTALL} -d $(DEST)/root.client/usr/vice/etc/dkload
+	$(INSTALL) -m 644 afs.ext.32 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32
+	-${STRIP} -X 32 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32
+	$(INSTALL) -m 644 afs.ext.32.map $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32.map
 	echo Install for 32-bit Kernel Complete

-dest_afs.ext.64: $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64
+dest_afs.ext.64: afs.ext.64
+	${INSTALL} -d $(DEST)/root.client/usr/vice/etc/dkload
+	$(INSTALL) -m 644 afs.ext.64 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64
+	-${STRIP} -X 64 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32
+	$(INSTALL) -m 644 afs.ext.64.map $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64.map
 	echo Install for 64-bit Kernel Complete

-install_afs.ext.32: $(DESTDIR)$(afskerneldir)/afs.ext.32
+install_afs.ext.32: afs.ext.32
+	${INSTALL} -d $(DESTDIR)$(afskerneldir)
+	$(INSTALL) -m 644 afs.ext.32 $(DESTDIR)$(afskerneldir)/afs.ext.32
+	-${STRIP} -X 32 $(DESTDIR)$(afskerneldir)/afs.ext.32
+	$(INSTALL) -m 644 afs.ext.32.map $(DESTDIR)$(afskerneldir)/afs.ext.32.map
 	echo Install for 32-bit Kernel Complete

-install_afs.ext.64: $(DESTDIR)$(afskerneldir)/afs.ext.64
+install_afs.ext.64: afs.ext.64
+	${INSTALL} -d $(DESTDIR)$(afskerneldir)
+	$(DESTDIR)$(afskerneldir)/afs.ext.64
+	$(INSTALL) -m 644 afs.ext.64 $(DESTDIR)$(afskerneldir)/afs.ext.64
+	-${STRIP} -X 64 $(DESTDIR)$(afskerneldir)/afs.ext.64
+	$(INSTALL) -m 644 afs.ext.64.map $(DESTDIR)$(afskerneldir)/afs.ext.64.map
 	echo Install for 64-bit Kernel Complete

 # Standard AFS->NFS translator support is removed in AFS 3.5 in favor of
@ -148,36 +165,10 @@ DEST_LIBAFSIAUTH = $(DEST)/root.client/usr/vice/etc/dkload/$(LIBAFSIAUTH)

 INST_LIBAFSIAUTH = ${DESTDIR}${afskerneldir}/$(LIBAFSIAUTH)

-$(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32: afs.ext.32
-	$(INSTALL) -f $? $@
-	-${STRIP} -X 32 $@
-	$(INSTALL) -f $?.map $@.map
-	
-$(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64: afs.ext.64
-	$(INSTALL) -f $? $@
-	-${STRIP} -X 64 $@
-	$(INSTALL) -f $?.map $@.map
-	
-$(DESTDIR)$(afskerneldir)/afs.ext.32: afs.ext.32
-	$(INSTALL) -f $? $@
-	-${STRIP} -X 32 $@
-	$(INSTALL) -f $?.map $@.map
-
-$(DESTDIR)$(afskerneldir)/afs.ext.64: afs.ext.64
-	$(INSTALL) -f $? $@
-	-${STRIP} -X 64 $@
-	$(INSTALL) -f $?.map $@.map
-
 $(DEST_LIBAFSIAUTH): $(LIBAFSIAUTH)
-	$(INSTALL) -f $? $@
-	-${STRIP} $@
-	$(INSTALL) -f $?.map $@.map
-	
+
 $(INST_LIBAFSIAUTH): $(LIBAFSIAUTH)
-	$(INSTALL) -f $? $@
-	-${STRIP} $@
-	$(INSTALL) -f $?.map $@.map
-	
+

 $(LIBAFSIAUTH): $(AFSAOBJS) $(AFSIAUTHOBJS)
 	${LD} ${LDSTUFF} -bloadmap:afs.ext.iauth.loadmap \
@ -197,9 +188,18 @@ afs.ext.64: $(AFSAOBJS) $(AFSNOIAUTHOBJS)
 		${LDFLAGS} ${IMPORTS64}

 libafs: $(LIBAFS) $(LIBAFS64) $(LIBAFSIAUTH)
-install_libafs: $(INST_LIBAFS) $(INST_LIBAFSIAUTH)
-dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSIAUTH)

+install_libafs: $(INST_LIBAFSIAUTH)
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	$(INSTALL) -m 644 $(LIBAFSIAUTH) $(INST_LIBAFSIAUTH)
+	-${STRIP} $(INST_LIBAFSIAUTH)
+	$(INSTALL) -m 644 $(LIBAFSIAUTH).map $(INST_LIBAFSIAUTH).map
+
+dest_libafs: $(DEST_LIBAFSIAUTH)
+	${INSTALL} -d $(DEST)/root.client/usr/vice/etc/dkload
+	$(INSTALL) -m 644 $(LIBAFSIAUTH) $(DEST_LIBAFSIAUTH)
+	-${STRIP} $(DEST_LIBAFSIAUTH)
+	$(INSTALL) -m 644 $(LIBAFSIAUTH).map $(DEST_LIBAFSIAUTH).map

 osi_assem.o:	osi_assem.s
 	${AS} -a${KASOPTS} -o osi_assem.o osi_assem.s
--- a/src/libafs/MakefileProto.DARWIN.in
+++ b/src/libafs/MakefileProto.DARWIN.in
@ -127,16 +127,16 @@ libafs: $(LIBAFSNONFS) ;
 install_libafs: $(LIBAFSNONFS) ;
 	-mkdir -p ${INST_LIBAFSNONFS}
 	-mkdir -p ${INST_LIBAFSNONFS}/Contents
-	$(INSTALL) -f ../${DARWIN_INFOFILE} ${INST_LIBAFSNONFS}/Contents/Info.plist
+	$(INSTALL) -m 644 ../${DARWIN_INFOFILE} ${INST_LIBAFSNONFS}/Contents/Info.plist
 	-mkdir -p ${INST_LIBAFSNONFS}/Contents/MacOS
-	$(INSTALL) -f ${LIBAFSNONFS} ${INST_LIBAFSNONFS}/Contents/MacOS/afs
+	$(INSTALL) -m 644 ${LIBAFSNONFS} ${INST_LIBAFSNONFS}/Contents/MacOS/afs

 dest_libafs: $(LIBAFSNONFS) ;
 	-mkdir -p ${DEST_LIBAFSNONFS}
 	-mkdir -p ${DEST_LIBAFSNONFS}/Contents
-	$(INSTALL) -f ../${DARWIN_INFOFILE} ${DEST_LIBAFSNONFS}/Contents/Info.plist
+	$(INSTALL) -m 644 ../${DARWIN_INFOFILE} ${DEST_LIBAFSNONFS}/Contents/Info.plist
 	-mkdir -p ${DEST_LIBAFSNONFS}/Contents/MacOS
-	$(INSTALL) -f ${LIBAFSNONFS} ${DEST_LIBAFSNONFS}/Contents/MacOS/afs
+	$(INSTALL) -m 644 ${LIBAFSNONFS} ${DEST_LIBAFSNONFS}/Contents/MacOS/afs


 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
--- a/src/libafs/MakefileProto.DUX.in
+++ b/src/libafs/MakefileProto.DUX.in
@ -85,27 +85,16 @@ DEST_AFSMOD = ${DEST}/root.client/bin/${AFSMOD}

 .PHONY: libafs install_libafs
 libafs:	${LIBAFSNONFS} ${AFSMOD}
-install_libafs:	${INST_LIBAFSNONFS} ${INST_AFSMOD}
-dest_libafs:	${DEST_LIBAFSNONFS} ${DEST_AFSMOD}

+install_libafs:	${LIBAFSNONFS} ${AFSMOD}
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	$(INSTALL) -m 644 ${LIBAFSNONFS} ${INST_LIBAFSNONFS}
+	$(INSTALL) -m 644 ${AFSMOD} ${INST_AFSMOD}

-${INST_LIBAFS}: ${LIBAFS}
-	$(INSTALL) -f $? $@
-
-${INST_LIBAFSNONFS}: ${LIBAFSNONFS}
-	$(INSTALL) -f $? $@
-
-${INST_AFSMOD}: ${AFSMOD}
-	$(INSTALL) -f $? $@
-
-${DEST_LIBAFS}: ${LIBAFS}
-	$(INSTALL) -f $? $@
-
-${DEST_LIBAFSNONFS}: ${LIBAFSNONFS}
-	$(INSTALL) -f $? $@
-
-${DEST_AFSMOD}: ${AFSMOD}
-	$(INSTALL) -f $? $@
+dest_libafs: ${LIBAFSNONFS} ${AFSMOD}
+	${INSTALL} -d ${DEST}/root.client/bin
+	$(INSTALL) -m 644 ${LIBAFSNONFS} ${DEST_LIBAFSNONFS}
+	$(INSTALL) -m 644 ${AFSMOD} ${DEST_AFSMOD}

 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 	$(LD) -r -o ${LIBAFS} ${AFSAOBJS} ${AFSNFSOBJS}
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@ -96,31 +96,14 @@ DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS}

 # libafs:	$(LIBAFS) $(LIBAFSNONFS)
 libafs:	$(LIBAFSNONFS)
-# install_libafs:	$(INST_LIBAFS) $(INST_LIBAFSNONFS)
-install_libafs:	$(INST_LIBAFSNONFS)
-# dest_libafs:	$(DEST_LIBAFS) $(DEST_LIBAFSNONFS)
-dest_libafs:	$(DEST_LIBAFSNONFS)
-#libafs:
-#	echo WARNING: No kernel module for ${SYS_NAME}

-#install_libafs:
-#	echo WARNING: No kernel module for ${SYS_NAME}
+install_libafs:	$(LIBAFSNONFS)
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	${INSTALL} -m 644 $(LIBAFSNONFS) $(INST_LIBAFSNONFS)

-#dest_libafs:
-#	echo WARNING: No kernel module for ${SYS_NAME}
-
-
-$(INST_LIBAFS): $(LIBAFS)
-	$(INSTALL) -f $? $@
-
-$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
-	$(INSTALL) -f $? $@
-
-$(DEST_LIBAFS): $(LIBAFS)
-	$(INSTALL) -f $? $@
-
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-	$(INSTALL) -f $? $@
+dest_libafs: $(LIBAFSNONFS)
+	${INSTALL} -d ${DEST}/root.client/bin
+	${INSTALL} -m 644 $(LIBAFSNONFS) $(DEST_LIBAFSNONFS)

 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 	$(LD) -r -o ${LIBAFS}.kld ${AFSAOBJS} ${AFSNFSOBJS}
--- a/src/libafs/MakefileProto.HPUX.in
+++ b/src/libafs/MakefileProto.HPUX.in
@ -227,20 +227,14 @@ DEST_LIBAFSNONFS = ${DEST}/root.client/usr/bin/${LIBAFSNONFS}


 libafs: ${LIBAFSNONFS}
-install_libafs: ${INST_LIBAFSNONFS}
-dest_libafs: ${DEST_LIBAFSNONFS}

-$(INST_LIBAFS): $(LIBAFS)
-	${INSTALL} -f $? $@
+install_libafs: $(LIBAFSNONFS)
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	${INSTALL} -m 644 $(LIBAFSNONFS) $(INST_LIBAFSNONFS)

-$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
-	${INSTALL} -f $? $@
-
-$(DEST_LIBAFS): $(LIBAFS)
-	${INSTALL} -f $? $@
-
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-	${INSTALL} -f $? $@
+dest_libafs: $(LIBAFSNONFS)
+	${INSTALL} -d ${DEST}/root.client/usr/bin
+	${INSTALL} -m 644 $(LIBAFSNONFS) $(DEST_LIBAFSNONFS)

 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 <all -ia64_hpux1123 -hp_ux1123>
--- a/src/libafs/MakefileProto.IRIX.in
+++ b/src/libafs/MakefileProto.IRIX.in
@ -475,10 +475,9 @@ install_COPYFILES:
 	chmod 644 ${DESTDIR}${afskerneldir}/afs

 dest_COPYFILES:
-	${INSTALL} -f sgi_system ${DEST}/root.client/bin/afs.sm
-	chmod 644 ${DEST}/root.client/bin/afs.sm
-	${INSTALL} -f sgi_master ${DEST}/root.client/bin/afs
-	chmod 644 ${DEST}/root.client/bin/afs
+	${INSTALL} -d ${DEST}/root.client/bin
+	${INSTALL} -m 644 sgi_system ${DEST}/root.client/bin/afs.sm
+	${INSTALL} -m 644 sgi_master ${DEST}/root.client/bin/afs

 # Create symlinks to clients we don't need to build.
 # If this changes, also change the kdump symlinks.
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@ -160,7 +160,7 @@ setup:
 		ln -fs ../Makefile.common $${KDIR}/Makefile.common; \
 		ln -fs ../config $${KDIR}/config; \
 	done 
-	
+
 # Compile SP and MP clients as requested

 ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
@ -302,50 +302,42 @@ ${LIBAFS_BM}: $(AFSAOBJS) $(AFSNONFSOBJS)
 	$(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS)
 <all>

-install_libafs:	$(INST_LIBAFS) 
+install_libafs:	$(LIBAFS) 
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	${INSTALL} -m 644 $(LIBAFS) $(INST_LIBAFS)
 	echo SP Install Complete

-install_libafs.mp: $(INST_LIBAFS_MP)
+install_libafs.mp: $(LIBAFS_MP)
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	${INSTALL} -m 644 $(LIBAFS) $(INST_LIBAFS_MP)
 	echo MP Install Complete

-install_libafs.ep: $(INST_LIBAFS_EP)
+install_libafs.ep: $(LIBAFS_EP)
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	${INSTALL} -m 644 $(LIBAFS) $(INST_LIBAFS_EP)
 	echo EP Install Complete

-install_libafs.bm: $(INST_LIBAFS_BM)
+install_libafs.bm: $(LIBAFS_BM)
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	${INSTALL} -m 644 $(LIBAFS) $(INST_LIBAFS_BM)
 	echo BM Install Complete

-dest_libafs:	$(DEST_LIBAFS) 
+dest_libafs:	$(LIBAFS) 
+	${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
+	${INSTALL} -m 644 $(LIBAFS) $(DEST_LIBAFS)
 	echo SP Install Complete

-dest_libafs.mp: $(DEST_LIBAFS_MP)
+dest_libafs.mp: $(LIBAFS_MP)
+	${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
+	${INSTALL} -m 644 $(LIBAFS) $(DEST_LIBAFS_MP)
 	echo MP Install Complete

-dest_libafs.ep: $(DEST_LIBAFS_EP)
+dest_libafs.ep: $(LIBAFS_EP)
+	${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
+	${INSTALL} -m 644 $(LIBAFS) $(DEST_LIBAFS_EP)
 	echo EP Install Complete

-dest_libafs.bm: $(DEST_LIBAFS_BM)
+dest_libafs.bm: $(LIBAFS_BM)
+	${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
+	${INSTALL} -m 644 $(LIBAFS) $(DEST_LIBAFS_BM)
 	echo BM Install Complete
-
-$(INST_LIBAFS): $(LIBAFS)
-	${INSTALL} -f $? $@
-
-$(INST_LIBAFS_MP): $(LIBAFS_MP)
-	${INSTALL} -f $? $@
-
-$(INST_LIBAFS_EP): $(LIBAFS_EP)
-	${INSTALL} -f $? $@
-
-$(INST_LIBAFS_BM): $(LIBAFS_BM)
-	${INSTALL} -f $? $@
-
-$(DEST_LIBAFS): $(LIBAFS)
-	${INSTALL} -f $? $@
-
-$(DEST_LIBAFS_MP): $(LIBAFS_MP)
-	${INSTALL} -f $? $@
-
-$(DEST_LIBAFS_EP): $(LIBAFS_EP)
-	${INSTALL} -f $? $@
-
-$(DEST_LIBAFS_BM): $(LIBAFS_BM)
-	${INSTALL} -f $? $@
--- a/src/libafs/MakefileProto.NBSD.in
+++ b/src/libafs/MakefileProto.NBSD.in
@ -92,18 +92,6 @@ dest_libafs:
 	echo WARNING: No kernel module for ${SYS_NAME}


-$(INST_LIBAFS): $(LIBAFS)
-	$(INSTALL) -f $? $@
-
-$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
-	$(INSTALL) -f $? $@
-
-$(DEST_LIBAFS): $(LIBAFS)
-	$(INSTALL) -f $? $@
-
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-	$(INSTALL) -f $? $@
-
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 	$(LD) -r -o ${LIBAFS} ${AFSAOBJS} ${AFSNFSOBJS}

--- a/src/libafs/MakefileProto.OBSD.in
+++ b/src/libafs/MakefileProto.OBSD.in
@ -91,20 +91,14 @@ DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS}

 libafs:	$(LIBAFSNONFS)
 	ls -l libafs.o
-install_libafs:	$(INST_LIBAFSNONFS)
-dest_libafs:	$(DEST_LIBAFSNONFS)

-$(INST_LIBAFS): $(LIBAFS)
-	$(INSTALL) -f $? $@
+install_libafs:	$(LIBAFS)
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	${INSTALL} -m 644 $(LIBAFS) $(INST_LIBAFSNONFS)

-$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
-	$(INSTALL) -f $? $@
-
-$(DEST_LIBAFS): $(LIBAFS)
-	$(INSTALL) -f $? $@
-
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-	$(INSTALL) -f $? $@
+dest_libafs: $(LIBAFS)
+	${INSTALL} -d ${DEST}/root.client/bin
+	$(INSTALL) -m 644 $(LIBAFS) $(DEST_LIBAFSNONFS)

 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 	$(LD) -r -o ${LIBAFS} ${AFSAOBJS} ${AFSNFSOBJS}
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@ -138,21 +138,16 @@ DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.o
 .PHONY: libafs

 libafs:	$(LIBAFSNONFS) $(LIBAFS)
-install_libafs:	$(INST_LIBAFSNONFS) $(INST_LIBAFS)
-dest_libafs:	$(DEST_LIBAFSNONFS) $(DEST_LIBAFS)

+install_libafs:	$(LIBAFS) $(LIBAFSNONFS)
+	${INSTALL} -d ${DESTDIR}${afskerneldir}
+	${INSTALL} -m 644 $(LIBAFS) $(INST_LIBAFS)
+	${INSTALL} -m 644 $(LIBAFSNONFS) $(INST_LIBAFSNONFS)

-$(INST_LIBAFS): $(LIBAFS)
-	${INSTALL} -f $? $@
-
-$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
-	${INSTALL} -f $? $@
-
-$(DEST_LIBAFS): $(LIBAFS)
-	${INSTALL} -f $? $@
-
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-	${INSTALL} -f $? $@
+dest_libafs: $(LIBAFS) $(LIBAFSNONFS)
+	${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
+	${INSTALL} -m 644 $(LIBAFS) $(DEST_LIBAFS)
+	${INSTALL} -m 644 $(LIBAFSNONFS) $(DEST_LIBAFSNONFS)

 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 	$(RM) -f $@
--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@ -94,10 +94,8 @@ LIBOBJS = \

 all: ${TOP_LIBDIR}/libafsauthent.a

-install: ${DESTDIR}${libdir}/libafsauthent.a
-
-${DEST}/lib/libafsauthent.a: libafsauthent.a
-	${INSTALL} $? $@
+${TOP_LIBDIR}/libafsauthent.a: libafsauthent.a
+	${INSTALL_DATA} $? $@

 libafsauthent.a: ${LIBOBJS}
 	$(RM) -f $@
@ -255,11 +253,10 @@ setpag.o: ${SYS}/setpag.c
 clean:
 	$(RM) -f *.o *.a libafsauthent*

-${DESTDIR}${libdir}/libafsauthent.a: libafsauthent.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libafsauthent.a: libafsauthent.a
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/libafsauthent.a
+install: libafsauthent.a
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL_DATA} libafsauthent.a ${DESTDIR}${libdir}/libafsauthent.a

+dest: libafsauthent.a
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL_DATA} libafsauthent.a ${DEST}/lib/libafsauthent.a
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@ -129,10 +129,8 @@ LIBOBJS = \

 all: ${TOP_LIBDIR}/libafsrpc.a

-install: ${DESTDIR}${libdir}/libafsrpc.a
-
-${DEST}/lib/libafsrpc.a: libafsrpc.a
-	${INSTALL} $? $@
+${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a
+	${INSTALL_DATA} $? $@

 libafsrpc.a: ${LIBOBJS}
 	$(RM) -f $@
@ -398,14 +396,13 @@ afscbint.xdr.o: ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c
 afsaux.o: ${FSINT}/afsaux.c
 	${CCRULE} ${FSINT}/afsaux.c

+install: libafsrpc.a
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL_DATA} libafsrpc.a ${DESTDIR}${libdir}/libafsrpc.a
+
+dest: libafsrpc.a
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL_DATA} libafsrpc.a ${DEST}/lib/libafsrpc.a
+
 clean:
 	$(RM) -f *.o libafsrpc*
-
-${DESTDIR}${libdir}/libafsrpc.a: libafsrpc.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/libafsrpc.a
-
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@ -57,6 +57,18 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \

 all: ${TOP_LIBDIR}/$(LIBJUAFS) ${TOP_LIBDIR}/$(LIBUAFS) linktest

+${TOP_LIBDIR}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/$(LIBUAFS): UAFS/$(LIBUAFS)
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/$(LIBJUAFS): JUAFS/$(LIBJUAFS)
+	${INSTALL_DATA} $? $@
+
 webinstall: all \
 	${TOP_LIBDIR}/$(LIBAFSWEB) \
 	${TOP_LIBDIR}/$(LIBAFSWEBKRB) 
@ -64,21 +76,6 @@ webinstall: all \
 linktest: UAFS/$(LIBUAFS) ${TOP_OBJDIR}/lib/libdes.a
 	$(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libafsutil.a $(TEST_LIBS) $(XLIBS)

-install: \
-	${DESTDIR}${libdir}/$(LIBUAFS) \
-	${DESTDIR}${libdir}/$(LIBJUAFS)
-
-dest: \
-	${DEST}/root.perf/include/afs/param.h \
-	${DEST}/root.perf/include/afs/stds.h \
-	${DEST}/root.perf/include/afs/afs_sysnames.h \
-	${DEST}/root.perf/include/afs/afs_stats.h \
-	${DEST}/root.perf/include/afs/sysincludes.h \
-	${DEST}/root.perf/include/afs/afs_usrops.h \
-	${DEST}/root.perf/lib/libdes.a \
-	${DEST}/root.perf/lib/$(LIBUAFS) \
-	${DEST}/root.perf/lib/$(LIBJUAFS)
-

 CRULE1=	$(CC) $(COMMON_INCLUDE) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
 CRULE2=	$(CC) $(COMMON_INCLUDE) $(OPTF) $(WEBOPTS) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
@ -1357,64 +1354,35 @@ clean:
 	-$(RM) -f  h net netinet rpc ufs machine inet nfs sys des linktest $(AFS_OS_CLEAN)


-${TOP_LIBDIR}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
-	${INSTALL} $? $@
+install: UAFS/$(LIBUAFS) JUAFS/$(LIBJUAFS)
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL_DATA} UAFS/$(LIBUAFS) ${DESTDIR}${libdir}/$(LIBUAFS)
+	${INSTALL_DATA} JUAFS/$(LIBJUAFS) ${DESTDIR}${libdir}/$(LIBJUAFS)

-${TOP_LIBDIR}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/$(LIBUAFS): UAFS/$(LIBUAFS)
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/$(LIBJUAFS): JUAFS/$(LIBJUAFS)
-	${INSTALL} $? $@
-
-
-${DESTDIR}${libdir}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/$(LIBUAFS): UAFS/$(LIBUAFS)
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/$(LIBJUAFS): JUAFS/$(LIBJUAFS)
-	${INSTALL} $? $@
-
-
-${DEST}/root.afsweb/usr/lib/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
-	${INSTALL} $? $@
-
-${DEST}/root.afsweb/usr/lib/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
-	${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/param.h: $(TOP_INCDIR)/afs/param.h
-	${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/stds.h: $(TOP_INCDIR)/afs/stds.h
-	${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/afs_sysnames.h: $(TOP_INCDIR)/afs/afs_sysnames.h
-	${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/afs_stats.h: $(TOP_INCDIR)/afs/afs_stats.h
-	${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/sysincludes.h: $(TOP_SRCDIR)/afs/sysincludes.h
-	${INSTALL} $? $@
-
-${DEST}/root.perf/include/afs/afs_usrops.h: $(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h
-	${INSTALL} $? $@
-
-${DEST}/root.perf/lib/libdes.a: ${TOP_OBJDIR}/lib/libdes.a
-	${INSTALL} $? $@
-
-${DEST}/root.perf/lib/$(LIBUAFS): UAFS/$(LIBUAFS)
-	${INSTALL} $? $@
-
-${DEST}/root.perf/lib/$(LIBJUAFS): JUAFS/$(LIBJUAFS)
-	${INSTALL} $? $@
+dest: $(TOP_INCDIR)/afs/param.h $(TOP_INCDIR)/afs/stds.h \
+		$(TOP_INCDIR)/afs/afs_sysnames.h \
+		$(TOP_INCDIR)/afs/afs_stats.h \
+		$(TOP_SRCDIR)/afs/sysincludes.h \
+		$(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h \
+		${TOP_OBJDIR}/lib/libdes.a UAFS/$(LIBUAFS) JUAFS/$(LIBJUAFS)
+	${INSTALL} -d ${DEST}/root.perf/include/afs
+	${INSTALL} -d ${DEST}/root.perf/lib
+	${INSTALL_DATA} $(TOP_INCDIR)/afs/param.h \
+		${DEST}/root.perf/include/afs/param.h
+	${INSTALL_DATA} $(TOP_INCDIR)/afs/stds.h \
+		${DEST}/root.perf/include/afs/stds.h
+	${INSTALL_DATA} $(TOP_INCDIR)/afs/afs_sysnames.h \
+		${DEST}/root.perf/include/afs/afs_sysnames.h
+	${INSTALL_DATA} $(TOP_INCDIR)/afs/afs_stats.h \
+		${DEST}/root.perf/include/afs/afs_stats.h
+	${INSTALL_DATA} $(TOP_SRCDIR)/afs/sysincludes.h \
+		${DEST}/root.perf/include/afs/sysincludes.h
+	${INSTALL_DATA} $(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h \
+		${DEST}/root.perf/include/afs/afs_usrops.h
+	${INSTALL_DATA} ${TOP_OBJDIR}/lib/libdes.a \
+		${DEST}/root.perf/lib/libdes.a
+	${INSTALL_DATA} UAFS/$(LIBUAFS) ${DEST}/root.perf/lib/$(LIBUAFS)
+	${INSTALL_DATA} JUAFS/$(LIBJUAFS) ${DEST}/root.perf/lib/$(LIBJUAFS)

 #
 # Common directory and other build targets
--- a/src/log/Makefile.in
+++ b/src/log/Makefile.in
@ -62,31 +62,27 @@ tokens.o: tokens.c ${TOP_INCDIR}/rx/xdr.h AFS_component_version_number.c
 #
 # Install targets
 #
-install: \
-	${DESTDIR}${bindir}/unlog \
-	${DESTDIR}${bindir}/tokens \
-	${DESTDIR}${bindir}/tokens.krb \
-	${DESTDIR}${afssrvbindir}/tokens \
-	${DESTDIR}${afssrvbindir}/tokens.krb \
-	${DESTDIR}${sbindir}/kseal
+install: unlog tokens tokens.krb kseal
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} -d ${DESTDIR}${afssrvbindir}
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL_PROGRAM} unlog ${DESTDIR}${bindir}/unlog
+	${INSTALL_PROGRAM} tokens ${DESTDIR}${bindir}/tokens
+	${INSTALL_PROGRAM} tokens.krb ${DESTDIR}${bindir}/tokens.krb
+	${INSTALL_PROGRAM} tokens ${DESTDIR}${afssrvbindir}/tokens
+	${INSTALL_PROGRAM} tokens.krb ${DESTDIR}${afssrvbindir}/tokens.krb
+	${INSTALL_PROGRAM} kseal ${DESTDIR}${sbindir}/kseal

-${DEST}/bin/unlog: unlog
-	${INSTALL} $? $@
-
-${DEST}/bin/tokens: tokens
-	${INSTALL} $? $@
-
-${DEST}/bin/tokens.krb: tokens.krb
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/tokens: tokens
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/tokens.krb: tokens.krb
-	${INSTALL} $? $@
-
-${DEST}/etc/kseal: kseal
-	${INSTALL} $? $@
+dest: unlog tokens tokens.krb kseal
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL_PROGRAM} unlog ${DEST}/bin/unlog
+	${INSTALL_PROGRAM} tokens ${DEST}/bin/tokens
+	${INSTALL_PROGRAM} tokens.krb ${DEST}/bin/tokens.krb
+	${INSTALL_PROGRAM} tokens ${DEST}/root.server/usr/afs/bin/tokens
+	${INSTALL_PROGRAM} tokens.krb ${DEST}/root.server/usr/afs/bin/tokens.krb
+	${INSTALL_PROGRAM} kseal ${DEST}/etc/kseal

 #
 # Misc. targets
@ -98,30 +94,3 @@ test:
 	cd test; $(MAKE)

 include ../config/Makefile.version
-
-${DESTDIR}${bindir}/unlog: unlog
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/tokens: tokens
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/tokens.krb: tokens.krb
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvbindir}/tokens: tokens
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvbindir}/tokens.krb: tokens.krb
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/kseal: kseal
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/bin/unlog \
-	${DEST}/bin/tokens \
-	${DEST}/bin/tokens.krb \
-	${DEST}/root.server/usr/afs/bin/tokens \
-	${DEST}/root.server/usr/afs/bin/tokens.krb \
-	${DEST}/etc/kseal
-
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@ -68,26 +68,15 @@ login.krb.o: login.c
 #
 # Installation targets
 #
-install: \
-	${DESTDIR}${bindir}/login \
-	${DESTDIR}${bindir}/login.krb
+install: login login.krb
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL_PROGRAM} login ${DESTDIR}${bindir}/login
+	${INSTALL_PROGRAM} login.krb ${DESTDIR}${bindir}/login.krb

-${DESTDIR}${bindir}/login: login
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/login.krb: login.krb
-	${INSTALL} $? $@
-
-
-dest: \
-	${DEST}/bin/login \
-	${DEST}/bin/login.krb
-
-${DEST}/bin/login: login
-	${INSTALL} $? $@
-
-${DEST}/bin/login.krb: login.krb
-	${INSTALL} $? $@
+dest: login login.krb
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL_PROGRAM} login ${DEST}/bin/login
+	${INSTALL_PROGRAM} login.krb ${DEST}/bin/login.krb

 #
 # Misc. targets
@ -96,4 +85,3 @@ clean:
 	$(RM) -f *.o ${OBJS} core login AFS_component_version_number.c

 include ../config/Makefile.version
-
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@ -15,10 +15,25 @@ CFLAGS=${LWP_DBG} ${LWP_OPTMZ} ${XCFLAGS} ${ARCHFLAGS} ${COMMON_INCL}
 LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \
 	waitkey.o threadname.o AFS_component_version_number.o

-all: ${TOP_LIBDIR}/liblwp.a ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h
+all: ${TOP_LIBDIR}/liblwp.a depinstall

 depinstall: ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h

+${TOP_LIBDIR}/liblwp.a: liblwp.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/lock.h: lock.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/lwp.h: lwp.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/preempt.h: preempt.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/timer.h: timer.h
+	${INSTALL_DATA} $? $@
+
 #
 # Build rules
 #
@ -143,22 +158,23 @@ rw.o: rw.c
 #
 # Install targets
 #
-install: ${DESTDIR}${libdir}/liblwp.a ${DESTDIR}${includedir}/lock.h ${DESTDIR}${includedir}/lwp.h ${DESTDIR}${includedir}/preempt.h ${DESTDIR}${includedir}/timer.h
+install: liblwp.a lock.h lwp.h preempt.h timer.h
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL} -d ${DESTDIR}${includedir}
+	${INSTALL_DATA} liblwp.a ${DESTDIR}${libdir}/liblwp.a
+	${INSTALL_DATA} lock.h ${DESTDIR}${includedir}/lock.h
+	${INSTALL_DATA} lwp.h ${DESTDIR}${includedir}/lwp.h
+	${INSTALL_DATA} preempt.h ${DESTDIR}${includedir}/preempt.h
+	${INSTALL_DATA} timer.h ${DESTDIR}${includedir}/timer.h

-${DEST}/lib/liblwp.a: liblwp.a
-	${INSTALL} $? $@
-
-${DEST}/include/lock.h: lock.h
-	${INSTALL} $? $@
-
-${DEST}/include/lwp.h: lwp.h
-	${INSTALL} $? $@
-
-${DEST}/include/preempt.h: preempt.h
-	${INSTALL} $? $@
-
-${DEST}/include/timer.h: timer.h
-	${INSTALL} $? $@
+dest: liblwp.a lock.h lwp.h preempt.h timer.h
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL} -d ${DEST}/include
+	${INSTALL_DATA} liblwp.a ${DEST}/lib/liblwp.a
+	${INSTALL_DATA} lock.h ${DEST}/include/lock.h
+	${INSTALL_DATA} lwp.h ${DEST}/include/lwp.h
+	${INSTALL_DATA} preempt.h ${DEST}/include/preempt.h
+	${INSTALL_DATA} timer.h ${DEST}/include/timer.h

 #
 # Misc. targets
@ -167,35 +183,3 @@ clean:
 	$(RM) -f *.o *.a core AFS_component_version_number.c

 include ../config/Makefile.version
-${DESTDIR}${libdir}/liblwp.a: liblwp.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/liblwp.a: liblwp.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/lock.h: lock.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/lock.h: lock.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/lwp.h: lwp.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/lwp.h: lwp.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/preempt.h: preempt.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/preempt.h: preempt.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/timer.h: timer.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/timer.h: timer.h
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/liblwp.a ${DEST}/include/lock.h ${DEST}/include/lwp.h ${DEST}/include/preempt.h ${DEST}/include/timer.h
-
--- a/src/mpp/Makefile.in
+++ b/src/mpp/Makefile.in
@ -8,15 +8,13 @@ include ../config/Makefile.version

 all: ${PROGRAM}

-install: ${DESTDIR}${sbindir}/mpp
+install: mpp
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL_PROGRAM} mpp ${DESTDIR}${sbindir}/mpp

-dest: ${DEST}/etc/mpp
-
-${DESTDIR}${sbindir}/mpp: mpp
-	${INSTALL} $? $@
-
-${DEST}/etc/mpp: mpp
-	${INSTALL} $? $@
+dest: mpp
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL_PROGRAM} mpp ${DEST}/etc/mpp

 installdoc: mpp.1
 	${INSTALL} -c mpp.1 ${DEST}/man/man1
--- a/src/null/Makefile.in
+++ b/src/null/Makefile.in
@ -10,11 +10,17 @@ include @TOP_OBJDIR@/src/config/Makefile.config

 all: ${TOP_LIBDIR}/libnull.a

-install: ${DESTDIR}${libdir}/afs/libnull.a
-
-${DEST}/lib/afs/libnull.a: libnull.a
+${TOP_LIBDIR}/libnull.a: libnull.a
 	${INSTALL} $? $@

+install: libnull.a
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL_DATA} libnull.a ${DESTDIR}${libdir}/afs/libnull.a
+
+dest: libnull.a
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL_DATA} libnull.a ${DEST}/lib/afs/libnull.a
+
 null.o: null.c AFS_component_version_number.c

 libnull.a: null.o 
@ -26,12 +32,3 @@ clean:
 	$(RM) -f *.o *.a AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${libdir}/afs/libnull.a: libnull.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libnull.a: libnull.a
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/afs/libnull.a
-
--- a/src/package/Makefile.in
+++ b/src/package/Makefile.in
@ -61,27 +61,14 @@ clean	:
 	$(RM) -f *.o gram.c test_gram.c core package package_test *.BAK y.output yacc.tmp yacc.acts\
 	AFS_component_version_number.c lex.c y.tab.h

-install:   ${DESTDIR}${sbindir}/package ${DESTDIR}${sbindir}/package_test ${DESTDIR}${sbindir}/makepkgfiles
-
-
-${DEST}/etc/package: package
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/package: package
-	${INSTALL} $? $@
-
-${DEST}/etc/package_test: package_test
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/package_test: package_test
-	${INSTALL} $? $@
-
-${DEST}/etc/makepkgfiles: makepkgfiles
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/makepkgfiles: makepkgfiles
-	${INSTALL} $? $@
-
-
-dest:   ${DEST}/etc/package ${DEST}/etc/package_test ${DEST}/etc/makepkgfiles
+install: package package_test makepkgfiles
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL_PROGRAM} package ${DESTDIR}${sbindir}/package
+	${INSTALL_PROGRAM} package_test ${DESTDIR}${sbindir}/package_test
+	${INSTALL_PROGRAM} makepkgfiles ${DESTDIR}${sbindir}/makepkgfiles

+dest: package package_test makepkgfiles
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL_PROGRAM} package ${DEST}/etc/package
+	${INSTALL_PROGRAM} package_test ${DEST}/etc/package_test
+	${INSTALL_PROGRAM} makepkgfiles ${DEST}/etc/makepkgfiles
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@ -29,6 +29,12 @@ CFLAGS =  ${PAM_DBG} ${PAM_OPTMZ} ${INCLUDES} ${PAM_CFLAGS}

 all: test_pam ${TOP_LIBDIR}/pam_afs.so.1 ${TOP_LIBDIR}/pam_afs.krb.so.1

+${TOP_LIBDIR}/pam_afs.so.1: pam_afs.so.1
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/pam_afs.krb.so.1: pam_afs.krb.so.1
+	${INSTALL_DATA} $? $@
+
 afs_setcred.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
 	${CC} ${CFLAGS} -c ${srcdir}/afs_setcred.c -o afs_setcred.o

@ -104,13 +110,15 @@ test_pam: test_pam.o
 		echo No link line for system $(SYS_NAME). ;; \
 	esac

-install:  ${DESTDIR}${libdir}/pam_afs.so.1 ${DESTDIR}${libdir}/pam_afs.krb.so.1
+install: pam_afs.so.1 pam_afs.krb.so.1
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL_DATA} pam_afs.so.1 ${DESTDIR}${libdir}/pam_afs.so.1
+	${INSTALL_DATA} pam_afs.krb.so.1 ${DESTDIR}${libdir}/pam_afs.krb.so.1

-${DEST}/lib/pam_afs.so.1: pam_afs.so.1
-	${INSTALL} $? $@
-
-${DEST}/lib/pam_afs.krb.so.1: pam_afs.krb.so.1
-	${INSTALL} $? $@
+dest: pam_afs.so.1 pam_afs.krb.so.1
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL_DATA} pam_afs.so.1 ${DEST}/lib/pam_afs.so.1
+	${INSTALL_DATA} pam_afs.krb.so.1 ${DEST}/lib/pam_afs.krb.so.1

 afs_pam_msg.o: afs_pam_msg.c afs_pam_msg.h afs_message.h
 afs_message.o: afs_message.c afs_message.h
@ -122,18 +130,3 @@ clean:
 	$(RM) -f *.a *.o *.so.1 test_pam core *~ AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${libdir}/pam_afs.so.1: pam_afs.so.1
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/pam_afs.so.1: pam_afs.so.1
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/pam_afs.krb.so.1: pam_afs.krb.so.1
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/pam_afs.krb.so.1: pam_afs.krb.so.1
-	${INSTALL} $? $@
-
-dest:  ${DEST}/lib/pam_afs.so.1 ${DEST}/lib/pam_afs.krb.so.1
-
--- a/src/pinstall/.cvsignore
+++ b/src/pinstall/.cvsignore
@ -1,4 +0,0 @@
-AFS_component_version_number.c
-Makefile
-config.log
-pinstall
--- a/src/pinstall/Makefile.in
+++ b/src/pinstall/Makefile.in
@ -1,35 +0,0 @@
-# Copyright 2000, International Business Machines Corporation and others.
-# All Rights Reserved.
-# 
-# This software has been released under the terms of the IBM Public
-# License.  For details, see the LICENSE file in the top-level source
-# directory or online at http://www.openafs.org/dl/license10.html
-
-srcdir=@srcdir@
-include @TOP_OBJDIR@/src/config/Makefile.config
-
-all: pinstall
-
-pinstall: ${srcdir}/install.c AFS_component_version_number.c 
-	${CC} ${CFLAGS} ${srcdir}/install.c -o pinstall ${XLIBS} ${PINSTALL_LIBS}
-
-test: pinstall
-	csh ./test/test_install
-
-${DEST}/bin/install: pinstall
-	${INSTALL} -f $? $@
-
-# Note: Some rule needs to appear here so that OSF's make does not try to
-# compile install from install.c. A ";" will not work since other platforms
-# complain. That's why we use 'echo'.
-install:
-	@echo -n
-
-clean:
-	$(RM) -f *.o pinstall AFS_component_version_number.c
-
-include ../config/Makefile.version
-
-
-dest: ${DEST}/bin/install
-
--- a/src/pinstall/install.c
+++ b/src/pinstall/install.c
@ -1,892 +0,0 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- * 
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-/*
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of IBM not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-******************************************************************/
-/* $ACIS: $ */
-
-/* ALSO utimes and strip the file
-
-Generic install command.  Options are:
-	-s 		strip the file	(default for executable files with no extension)
-	-ns		do not strip the file	(default for other files)
-	-c		ignored for compatability
-	-m <mode>	chmod to this value
-	-o <user>	chown to this user
-	-g <group>	chgrp to this group
-	-f		target path is a file
-	-q		be very, very quick and quiet
-	-l <envcwd>	attempt symbolic link back from destination to source
-			with the current directory in the specified environment
-			variable
-*/
-
-#define MAXFILES 200
-#define BUFSIZE 32768
-#include <afsconfig.h>
-#include <afs/param.h>
-
-RCSID
-    ("$Header$");
-
-#include <stdio.h>
-#include <pwd.h>
-#include <grp.h>
-#include <errno.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#ifdef	AFS_SUN5_ENV
-#include <fcntl.h>
-#include <string.h>
-#include <elf.h>
-#else
-#ifdef AFS_DARWIN_ENV
-#include <fcntl.h>
-#include <string.h>
-#else
-#include <strings.h>
-#include <a.out.h>
-#endif
-#endif
-#ifdef	AFS_HPUX_ENV
-#include <utime.h>
-#endif
-#include <unistd.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#include <stdio.h>
-
-static struct stat istat, ostat;
-static int stripcalled = 0;
-
-/* How many systems don't have strerror now? */
-#ifndef HAVE_STRERROR
-#if !defined(AFS_DARWIN60_ENV) && !defined(AFS_FBSD50_ENV)
-extern int sys_nerr;
-#endif
-#if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV)
-extern char *sys_errlist[];
-#endif
-char *ErrorString(int aerrno);
-#else
-#define ErrorString strerror
-#endif
-
-/* static prototypes */
-int stripName(char *aname);
-int atoo(register char *astr);
-
-
-#if defined(AFS_HPUX_ENV) && !defined(AFS_HPUX102_ENV)
-int
-utimes(char *file, struct timeval tvp[2])
-{
-    struct utimbuf times;
-
-    times.actime = tvp[0].tv_sec;
-    times.modtime = tvp[1].tv_sec;
-    return (utime(file, &times));
-}
-#endif
-
-static char *
-strrpbrk(char *s, char *set)
-{
-    char sets[256];
-    int i;
-
-    memset(sets, 0, sizeof(sets));
-    while (*set)
-	sets[(int)*set++] = 1;
-    i = strlen(s);
-    while (i > 0)
-	if (sets[(int)s[--i]])
-	    return &s[i];
-    return 0;
-}
-
-#ifndef HAVE_STRERROR
-char *
-ErrorString(int aerrno)
-{
-    static char tbuffer[100];
-    if (aerrno < 0 || aerrno >= sys_nerr) {
-	sprintf(tbuffer, "undefined error code %d", aerrno);
-    } else {
-	strcpy(tbuffer, sys_errlist[aerrno]);
-    }
-    return tbuffer;
-}
-#endif
-
-int
-stripName(char *aname)
-{
-    if (strrchr(aname, '.') == 0)
-	return 1;
-    else
-	return 0;
-}
-
-int
-atoo(register char *astr)
-{
-    register afs_int32 value;
-    register char tc;
-    value = 0;
-    while ((tc = *astr++)) {
-	value <<= 3;
-	value += tc - '0';
-    }
-    return value;
-}
-
-#if	defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_OBSD_ENV) || defined(AFS_NBSD_ENV)
-/*
- * Implementation lifted from that for AIX 3.1, since there didn't seem to be any
- * reason why it wouldn't work.
- */
-static int
-quickStrip(char *iname, char *oname, int ignored, int copy_only)
-{
-    int pid;
-    pid_t status;
-    static char *env[] = {
-	0,
-    };
-    static char *strip[] = {
-	"strip", 0, 0,
-    };
-    static char *copy[] = {
-	"cp", 0, 0, 0,
-    };
-
-    /*
-     * first, copy the `iname' to the `oname'
-     */
-    switch (pid = fork()) {
-    case -1:			/* error        */
-	perror("fork");
-	return -1;
-
-    case 0:			/* child        */
-	copy[1] = iname;
-	copy[2] = oname;
-	execve("/bin/cp", copy, env);
-	perror("/bin/cp");
-	exit(1);
-
-    default:			/* parent       */
-	if (waitpid(pid, &status, 0) != pid && errno != ECHILD) {
-	    perror("waitpid");
-	    return -1;
-	}
-    }
-
-    if (status != 0) {
-	fprintf(stderr, "Bad exit code from /bin/cp: %d\n", status);
-	return -1;
-    }
-
-    /*
-     * need to do a chmod to guarantee that the perms will permit
-     * the strip.  Perms are fixed up later.
-     */
-    if (chmod(oname, 0700)) {
-	perror("chmod");
-	return -1;
-    }
-#if !defined(AFS_OBSD_ENV) && !defined(AFS_NBSD_ENV)
-    /*
-     * done the copy, now strip if desired.
-     */
-    if (copy_only)
-	return 0;
-
-    switch (pid = fork()) {
-    case -1:			/* error        */
-	perror("fork");
-	return -1;
-
-    case 0:			/* child        */
-	strip[1] = oname;
-#ifdef	AFS_SUN5_ENV
-#define	STRIP_BIN	"/usr/ccs/bin/strip"
-#elif defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-#define STRIP_BIN	"/usr/bin/strip"
-#else
-#define	STRIP_BIN	"/bin/strip"
-#endif
-	execve(STRIP_BIN, strip, env);
-	perror(STRIP_BIN);
-	exit(1);
-
-    default:			/* parent       */
-	if (waitpid(pid, &status, 0) != pid && errno != ECHILD) {
-	    perror("waitpid");
-	    return -1;
-	}
-    }
-#endif
-
-    return status;
-}
-
-#else
-#ifdef AFS_AIX_ENV
-#ifdef AFS_AIX32_ENV
-/*
- * whoa! back up and be a little more rational (every little bit helps in
- * aix_31).
- */
-static int
-quickStrip(char *iname, char *oname, int ignored, int copy_only)
-{
-    int pid, status;
-    static char *env[] = {
-	0,
-    };
-    static char *strip[] = {
-	"strip", 0, 0,
-    };
-    static char *copy[] = {
-	"cp", 0, 0, 0,
-    };
-
-    /*
-     * first, copy the `iname' to the `oname'
-     */
-    switch (pid = fork()) {
-    case -1:			/* error        */
-	perror("fork");
-	return -1;
-
-    case 0:			/* child        */
-	copy[1] = iname;
-	copy[2] = oname;
-	execve("/bin/cp", copy, env);
-	perror("/bin/cp");
-	exit(1);
-
-    default:			/* parent       */
-	if (waitpid(pid, &status, 0) != pid && errno != ECHILD) {
-	    perror("waitpid");
-	    return -1;
-	}
-    }
-
-    if (status != 0) {
-	fprintf(stderr, "Bad exit code from /bin/cp: %d\n", status);
-	return -1;
-    }
-
-    /*
-     * need to do a chmod to guarantee that the perms will permit
-     * the strip.  Perms are fixed up later.
-     */
-    if (chmod(oname, 0700)) {
-	perror("chmod");
-	return -1;
-    }
-
-    /*
-     * done the copy, now strip if desired.
-     */
-    if (copy_only)
-	return 0;
-
-    switch (pid = fork()) {
-    case -1:			/* error        */
-	perror("fork");
-	return -1;
-
-    case 0:			/* child        */
-	strip[1] = oname;
-	execve("/bin/strip", strip, env);
-	perror("/bin/strip");
-	exit(1);
-
-    default:			/* parent       */
-	if (waitpid(pid, &status, 0) != pid && errno != ECHILD) {
-	    perror("waitpid");
-	    return -1;
-	}
-    }
-
-    return status;
-}
-
-#endif /* AFS_AIX32_ENV        */
-#else /* !AFS_AIX_ENV         */
-
-#ifdef	mips
-#include "sex.h"
-int
-quickStrip(int fd, afs_int32 asize)
-{
-    FILHDR fheader;
-    int dum, newlen;
-    int mysex, swapheader;
-
-    /* Read the file header, if it is one. */
-    if (lseek(fd, 0, L_SET) == -1) {
-	printf("Initial lseek failed while stripping file: %s\n",
-	       ErrorString(errno));
-	return -1;
-    }
-    dum = read(fd, (char *)&fheader, sizeof(fheader));
-    /* Fail on I/O error */
-    if (dum < 0) {
-	printf("Initial read failed while stripping: %s\n",
-	       ErrorString(errno));
-	return -1;
-    }
-    /* If the file is smaller than a file header, forget it. */
-    if (dum != sizeof(fheader))
-	return 0;
-#ifdef AFS_DECOSF_ENV
-    mysex = LITTLEENDIAN;
-#else
-    mysex = gethostsex();
-    if (mysex != BIGENDIAN && mysex != LITTLEENDIAN)
-	return 0;
-#endif /* DEC OSF */
-    swapheader = 0;
-    if (fheader.f_magic == MIPSELMAGIC) {
-	if (mysex == BIGENDIAN)
-	    swapheader = 1;
-    } else if (fheader.f_magic == MIPSEBMAGIC) {
-	if (mysex == LITTLEENDIAN)
-	    swapheader = 1;
-    } else
-	return 0;		/* not executable */
-#ifdef AFS_DECOSF_ENV
-    if (swapheader)
-	return 0;
-#else
-    if (swapheader)
-	swap_filehdr(&fheader, gethostsex());
-#endif /* DEC OSF */
-    /* Already stripped? */
-    if (fheader.f_symptr == 0 || fheader.f_nsyms == 0)
-	return 0;
-    /* Strip it.  Zero out the symbol pointers. */
-    newlen = fheader.f_symptr;
-    fheader.f_symptr = 0;
-    fheader.f_nsyms = 0;
-#ifndef AFS_DECOSF_ENV
-    if (swapheader)
-	swap_filehdr(&fheader, gethostsex());
-#endif /* DEC OSF */
-    if (lseek(fd, 0, L_SET) == -1)
-	return -1;
-    if (write(fd, (char *)&fheader, sizeof(fheader)) != sizeof(fheader))
-	return -1;
-/* Now truncate the file itself. */
-    if (ftruncate(fd, newlen) != 0)
-	return -1;
-    return 0;
-}
-#else /* !mips */
-static int
-quickStrip(int afd, afs_int32 asize)
-{
-    int n, bytesLeft;
-    struct exec buf;
-    struct exec *head;
-    n = lseek(afd, 0, 0);
-    if (n < 0) {
-	printf("Initial lseek failed while stripping file: %s\n",
-	       ErrorString(errno));
-	return -1;
-    }
-    n = read(afd, &buf, sizeof(buf));
-    if (n < 0) {
-	printf("Initial read failed while stripping: %s\n",
-	       ErrorString(errno));
-	return -1;
-    }
-    head = &buf;
-    if (n >= sizeof(*head) && !N_BADMAG(*head)) {	/* This code lifted from strip.c. */
-	bytesLeft = (afs_int32) head->a_text + head->a_data;
-	head->a_syms = head->a_trsize = head->a_drsize = 0;
-	if (head->a_magic == ZMAGIC)
-	    bytesLeft += N_TXTOFF(*head) - sizeof(*head);
-	/* also include size of header */
-	bytesLeft += sizeof(*head);
-	n = lseek(afd, 0, 0);
-	if (n < 0) {
-	    printf("lseek failed while stripping file: %s\n",
-		   ErrorString(errno));
-	    return -1;
-	}
-	n = write(afd, &buf, sizeof(buf));
-	if (n < 0) {
-	    printf("write failed while stripping file: %s\n",
-		   ErrorString(errno));
-	    return -1;
-	}
-    } else
-	bytesLeft = 0;
-
-    /* check if size of stripped file is same as existing file */
-    if (bytesLeft != 0 && bytesLeft != asize) {
-	if (ftruncate(afd, bytesLeft) < 0) {
-	    printf("ftruncate failed after stripping file: %s\n",
-		   ErrorString(errno));
-	    return -1;
-	}
-    }
-    return 0;
-}
-#endif /* mips */
-#endif
-#endif /* AFS_HPUX_ENV */
-
-#include "AFS_component_version_number.c"
-
-int
-main(int argc, char *argv[])
-{
-    int setOwner, setMode, setGroup, ifd, ofd;
-    afs_int32 mode = 0, owner, group;
-    struct passwd *tpw;
-    struct group *tgp;
-    char *fnames[MAXFILES], *newNames[MAXFILES];
-    afs_int32 rcode, code;
-    char *dname;
-    char pname[1024];
-#if defined (AFS_HPUX_ENV)
-    char pnameBusy[1024];
-#endif /* AFS_HPUX_ENV */
-    char pnametmp[1024];
-    int pnamelen;
-    afs_int32 newcode;
-    static char diskBuffer[BUFSIZE];	/* must be static to avoid compiler bugs for large stuff */
-    char myHostName[100];
-    struct timeval tvp[2];
-    int isDir;
-    int strip;
-    int fptr;
-    register char *tp;
-    register afs_int32 i;
-
-#ifdef	AFS_AIX32_ENV
-    /*
-     * The following signal action for AIX is necessary so that in case of a 
-     * crash (i.e. core is generated) we can include the user's data section 
-     * in the core dump. Unfortunately, by default, only a partial core is
-     * generated which, in many cases, isn't too useful.
-     */
-    struct sigaction nsa;
-
-    sigemptyset(&nsa.sa_mask);
-    nsa.sa_handler = SIG_DFL;
-    nsa.sa_flags = SA_FULLDUMP;
-    sigaction(SIGSEGV, &nsa, NULL);
-#endif
-    fptr = 0;
-    rcode = 0;
-    strip = -1;			/* don't know yet */
-    owner = 0;
-    setOwner = 0;
-    setMode = 0;
-    group = 0;
-    setGroup = 0;
-    isDir = -1;			/* don't know yet */
-
-    for (i = 1; i < argc; i++) {
-	tp = argv[i];
-	if (tp[0] == '-') {	/* a switch */
-	    if (!strcmp(tp, "-m"))
-		mode = atoo(argv[++i]), setMode = 1;
-	    else if (!strcmp(tp, "-s"))
-		strip = 1;
-	    else if (!strcmp(tp, "-ns"))
-		strip = 0;
-	    else if (!strcmp(tp, "-c"))	/* nothing */
-		;
-	    else if (!strcmp(tp, "-f"))
-		isDir = 0;	/* => dest is file */
-	    else if (!strcmp(tp, "-o")) {	/* look up the dude */
-		tpw = getpwnam(argv[++i]);
-		if (!tpw) {
-		    printf("User %s not found in passwd database, ignored\n",
-			   argv[i]);
-		} else {
-		    owner = tpw->pw_uid;
-		    setOwner = 1;
-		}
-	    } else if (!strcmp(tp, "-g")) {	/* look up the dude */
-		tgp = getgrnam(argv[++i]);
-		if (!tgp) {
-		    printf("Group %s not found in passwd database; ignored\n",
-			   argv[i]);
-		} else {
-		    group = tgp->gr_gid;
-		    setGroup = 1;
-		}
-	    } else {
-		printf("Bad switch %s\n", argv[i]);
-		exit(1);
-	    }
-	} else {		/* a file name */
-	    if (fptr >= MAXFILES) {
-		printf("Too many files on command line, max is %d\n",
-		       MAXFILES);
-		exit(1);
-	    }
-	    fnames[fptr++] = argv[i];
-	}
-    }
-
-    /* we've parse the commands, now *do* them */
-
-    /* otherwise we are doing a local install, so we do the work for each file
-     * here the last name in the fname array is the dir in which to put all
-     * this stuff */
-
-    if (fptr < 2) {
-	printf("Not enough file names\n");
-	exit(1);
-    }
-
-    /* N file usage requires last argument to be a directory.  If -f was
-     * specified it is an error.  In the 2 file usage when -f is not specified
-     * use a heuristic.  If the ends of the two pathnames are equal then assume
-     * the target is a file, otherwise assume it is a directory. */
-
-    if ((fptr > 2) && (isDir == 0)) {
-	printf
-	    ("target must be a directory, don't use multiple source files with -f switch\n");
-	exit(1);
-    } else if (fptr > 2)
-	isDir = 1;
-    else if (isDir != 0) {
-	char *targetSuffix;
-	char *sourceSuffix;
-
-	targetSuffix = strrpbrk(fnames[1], "./");
-	sourceSuffix = strrpbrk(fnames[0], "./");
-	if (sourceSuffix == 0) {
-	    sourceSuffix = fnames[0];
-	    if (targetSuffix == 0)
-		targetSuffix = fnames[1];
-	    else
-		targetSuffix++;
-	} else if (targetSuffix == 0)
-	    targetSuffix = fnames[1];
-	if (strcmp(targetSuffix, sourceSuffix) == 0)
-	    isDir = 0;
-    }
-
-    dname = fnames[--fptr];
-    if (stat(dname, &istat) < 0) {
-	if ((errno == ENOENT) || (errno == ENOTDIR)) {
-	    /* create path */
-	    char protopath[BUFSIZ];
-	    int i = 0;
-	    char c;
-	    while (dname[i]) {
-		do {
-		    protopath[i] = dname[i];
-		    c = dname[++i];	/* next char */
-		} while (!((c == 0) || (c == '/')));
-		protopath[i] = 0;
-
-		/* don't mkdir last component if target is a file */
-		if ((c == 0) && (isDir == 0))
-		    break;
-
-		/* else create dir component if it doesn't exist */
-		code = stat(protopath, &istat);
-		if (code && (errno == ENOENT)) {
-		    code = mkdir(protopath, 0755);
-		    if (code) {
-			printf("Can't create destination path at %s\n",
-			       protopath);
-			exit(1);
-		    }
-		}
-	    }			/* while dname not exhausted */
-	    if (isDir == -1)
-		isDir = 1;
-	} else {
-	    printf("Can't stat destination ``%s'': %s\n", dname,
-		   ErrorString(errno));
-	    exit(1);
-	}
-    } else {
-	if ((istat.st_mode & S_IFMT) == S_IFDIR)
-	    isDir = 1;
-	else
-	    isDir = 0;
-    }
-
-    /* either can be n files and one dir, or one file and one target */
-    if (!isDir && fptr != 1) {
-	printf("target for multiple files must be a dir\n");
-	exit(1);
-    }
-
-    for (i = 0; i < fptr; i++) {	/* figure out name to put as entry name for file */
-	tp = strrchr(fnames[i], '/');
-	if (tp)
-	    newNames[i] = tp + 1;
-	else
-	    newNames[i] = fnames[i];
-    }
-    for (i = 0; i < fptr; i++) {	/* copy newName[i] into directory dname */
-
-	/* pname is target file in either case */
-	if (isDir) {
-	    strcpy(pname, dname);
-	    strcat(pname, "/");
-	    strcat(pname, newNames[i]);
-	} else
-	    strcpy(pname, dname);
-	strcpy(pnametmp, pname);
-	/* Make up a temporary name for a destination */
-	pnamelen = strlen(pnametmp);
-	gethostname(myHostName, sizeof(myHostName) - 1);	/* lv room for null */
-	if (pnamelen > 1020 - strlen(myHostName))
-	    pnamelen = 1020 - strlen(myHostName);
-	pnametmp[pnamelen] = '.';
-	strcpy(&pnametmp[pnamelen + 1], myHostName);
-	if (strcmp(fnames[i], pnametmp) == 0)
-	    strcpy(&pnametmp[pnamelen], ".NeW");
-
-	ifd = open(fnames[i], O_RDONLY, 0);
-	if (ifd < 0) {
-	    printf("Can't open source file ``%s'': %s\n", fnames[i],
-		   ErrorString(errno));
-	    rcode = 1;
-	    continue;
-	}
-	if (fstat(ifd, &istat) < 0) {
-	    printf("Cound not fstat input file ``%s'': %s; skipping it\n",
-		   fnames[i], ErrorString(errno));
-	    close(ifd);
-	    rcode = 1;
-	    continue;
-	}
-	if (lstat(pname, &ostat) == 0) {
-	    if ((ostat.st_size == istat.st_size)
-		&& (ostat.st_mtime == istat.st_mtime) && ((!setMode)
-							  ||
-							  ((ostat.
-							    st_mode & S_IFMT)
-							   == mode))
-		&& ((!setOwner) || (ostat.st_uid == owner)) && ((!setGroup)
-								|| (ostat.
-								    st_gid ==
-								    group))) {
-		close(ifd);
-		printf("No changes to %s since %s installed\n", fnames[i],
-		       pname);
-		continue;
-	    }
-	}
-#if	defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_OBSD_ENV) || defined(AFS_NBSD_ENV)
-	stripcalled = 0;
-	if (strip == 1 || ((strip == -1 && ((istat.st_mode & 0111) == 0111)
-			    && stripName(newNames[i]))))
-	    stripcalled = 1;
-	if (!stripcalled) {
-	    /* Simply copy target to dest */
-	    quickStrip(fnames[i], pnametmp, istat.st_size, 1);
-	} else {
-	    if (quickStrip(fnames[i], pnametmp, istat.st_size, 0) < 0) {
-		printf
-		    ("...strip failed for output temp file ``%s''; skipping it\n",
-		     pnametmp);
-		close(ifd);
-		unlink(pnametmp);
-		rcode = 1;
-		continue;
-	    }
-	}
-	close(ifd);
-
-	ofd = open(pnametmp, O_RDWR, 0);
-	if (ofd < 0) {
-	    printf("Could not open output temp file ``%s'': %s\n", pnametmp,
-		   ErrorString(errno));
-	    close(ifd);
-	    rcode = 1;
-	    continue;
-	}
-	if (!setMode)
-	    mode = istat.st_mode;	/* Was 0755:> this is the default for our rcs to work */
-#else /* AFS_AIX_ENV */
-	/* check to see if this file is hard to duplicate */
-	ofd = open(pnametmp, O_RDWR | O_TRUNC | O_CREAT, 0666);
-	if (ofd < 0) {
-	    printf("Could not create output temp file ``%s'': %s\n", pnametmp,
-		   ErrorString(errno));
-	    close(ifd);
-	    rcode = 1;
-	    continue;
-	}
-	if (!setMode)
-	    mode = istat.st_mode;	/* Was 0755:> this is the default for our rcs to work */
-	/* here both files are open and ready to go */
-	while (1) {
-	    code = read(ifd, diskBuffer, BUFSIZE);
-	    if (code == 0)
-		break;
-	    if (code < 0) {
-		printf("READ ERROR %d: %s\n", errno, ErrorString(errno));
-		break;
-	    }
-	    errno = 0;
-	    newcode = write(ofd, diskBuffer, code);
-	    if (newcode != code) {
-		printf("WRITE ERROR %d: %s\n", errno, ErrorString(errno));
-		break;
-	    }
-	}
-	if (code != 0) {
-	    rcode = 1;		/* an error occurred copying the file */
-	    printf
-		("Warning: Error occurred writing output temp file %s; skipping it\n",
-		 pnametmp);
-	    close(ifd);
-	    unlink(pnametmp);
-	    close(ofd);
-	    continue;		/* to the next file */
-	}
-	/* strip the file? */
-	if (strip == 1 || (strip == -1 && ((istat.st_mode & 0111) == 0111)
-			   && stripName(newNames[i])))
-	    if (quickStrip(ofd, istat.st_size) < 0) {
-		printf
-		    ("...strip failed for output temp file ``%s''; skipping it\n",
-		     pnametmp);
-		close(ifd);
-		unlink(pnametmp);
-		rcode = 1;
-		continue;
-	    }
-
-	/* do the chmod, etc calls before closing the file for max parallelism on store behind */
-	close(ifd);
-
-#endif /* AFS_AIX_ENV */
-	if (fchmod(ofd, mode) < 0) {
-	    printf("Couldn't chmod output temp file ``%s'': %s\n", pnametmp,
-		   ErrorString(errno));
-	    unlink(pnametmp);
-	    close(ofd);
-	    rcode = 1;
-	    continue;
-	}
-
-	tvp[0].tv_sec = istat.st_atime;
-	tvp[0].tv_usec = 0;
-	tvp[1].tv_sec = istat.st_mtime;
-	tvp[1].tv_usec = 0;
-	if (utimes(pnametmp, tvp) < 0) {
-	    printf("Couldn't utimes output temp file ``%s'': %s\n", pnametmp,
-		   ErrorString(errno));
-	    unlink(pnametmp);
-	    close(ofd);
-	    rcode = 1;
-	    continue;
-	}
-	code = close(ofd);
-	if (code != 0) {
-	    printf("Warning: Could not close output temp file %s (%s)\n",
-		   pnametmp, ErrorString(errno));
-	    unlink(pnametmp);
-	    rcode = 1;		/* an error occurred closing the output file */
-	    continue;		/* to the next file */
-	}
-
-	/* do this later so vice doesn't see chown of unstored file */
-	if (setOwner || setGroup)
-	    if (chown
-		(pnametmp, (setOwner ? owner : -1),
-		 (setGroup ? group : -1)) < 0) {
-		printf("Couldn't set %s for output temp file %s: %s\n",
-		       (setOwner ? (setGroup ? "owner and group" : "owner") :
-			"group"), pnametmp, ErrorString(errno));
-		unlink(pnametmp);
-		rcode = 1;
-		continue;
-	    }
-
-	if (rename(pnametmp, pname) < 0) {
-#if defined(AFS_HPUX_ENV)
-	    if (errno == ETXTBSY) {
-		(void)strcpy(pnameBusy, pname);
-		(void)strcat(pnameBusy, ".BUSY");
-		if (rename(pname, pnameBusy) == 0) {
-		    fprintf(stdout, "Had to leave old file: %s.\n",
-			    pnameBusy);
-		    fprintf(stdout,
-			    "Please delete this file when the program using it is finished.\n");
-		    if (rename(pnametmp, pname) < 0) {
-#endif /* AFS_HPUX_ENV */
-
-			printf
-			    ("Couldn't rename temp file %s to be output file %s: %s\n",
-			     pnametmp, pname, ErrorString(errno));
-			unlink(pnametmp);
-			rcode = 1;
-			continue;
-
-#if defined(AFS_HPUX_ENV)
-		    }
-		} else {
-		    fprintf(stderr,
-			    "Couldn't move busy target file %s to make room for new version %s: %s\n",
-			    pname, pnametmp, ErrorString(errno));
-		    if (errno == ETXTBSY) {
-			fprintf(stderr,
-				"Try terminating any programs using the file %s and then re-run %s.\n",
-				pnameBusy, argv[0]);
-		    }
-		    unlink(pnametmp);
-		    rcode = 1;
-		    continue;
-		}
-	    }
-#endif /* AFS_HPUX_ENV */
-	}
-    }
-    /* all done now */
-    exit(rcode);
-}
--- a/src/pinstall/test/.cvsignore
+++ b/src/pinstall/test/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/src/pinstall/test/Makefile.in
+++ b/src/pinstall/test/Makefile.in
@ -1,17 +0,0 @@
-# Copyright 2000, International Business Machines Corporation and others.
-# All Rights Reserved.
-# 
-# This software has been released under the terms of the IBM Public
-# License.  For details, see the LICENSE file in the top-level source
-# directory or online at http://www.openafs.org/dl/license10.html
-
-srcdir=@srcdir@
-include @TOP_OBJDIR@/src/config/Makefile.config
-
-
-all:
-
-install:
-
-dest:
-
--- a/src/pinstall/test/test_install
+++ b/src/pinstall/test/test_install
@ -1,33 +0,0 @@
-#!/bin/csh -fe
-# Copyright 2000, International Business Machines Corporation and others.
-# All Rights Reserved.
-# 
-# This software has been released under the terms of the IBM Public
-# License.  For details, see the LICENSE file in the top-level source
-# directory or online at http://www.openafs.org/dl/license10.html
-
-alias pi ./pinstall
-alias ex 'if ( ! (-f \!:*) ) exit ( { echo \!:* failed } )'
-rm -rf testdir
-
-pi Makefile testdir
-ex testdir/Makefile
-pi Makefile testdir
-ex testdir/Makefile
-rm -rf testdir
-
-pi Makefile testdir/Makefile
-ex testdir/Makefile
-pi Makefile testdir/Makefile
-ex testdir/Makefile
-rm -rf testdir
-
-pi -f Makefile testdir/install
-ex testdir/install
-rm -rf testdir
-
-pi install.c testdir/foo.c
-ex testdir/foo.c
-pi install.c testdir/c
-ex testdir/c/install.c
-rm -rf testdir
--- a/src/procmgmt/Makefile.in
+++ b/src/procmgmt/Makefile.in
@ -10,6 +10,12 @@ include @TOP_OBJDIR@/src/config/Makefile.config

 all: ${TOP_LIBDIR}/libprocmgmt.a ${TOP_INCDIR}/afs/procmgmt.h

+${TOP_LIBDIR}/libprocmgmt.a: libprocmgmt.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/procmgmt.h: ${srcdir}/procmgmt.h
+	${INSTALL_DATA} $? $@
+
 #
 # Build targets
 #
@ -24,13 +30,19 @@ procmgmt_unix.o: ${srcdir}/procmgmt_unix.c ${srcdir}/procmgmt.h
 #
 # Install targets
 #
-install: ${DESTDIR}${libdir}/afs/libprocmgmt.a ${DESTDIR}${includedir}/afs/procmgmt.h
+install: libprocmgmt.a
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libprocmgmt.a ${DESTDIR}${libdir}/afs/libprocmgmt.a
+	${INSTALL_DATA} ${srcdir}/procmgmt.h \
+		${DESTDIR}${includedir}/afs/procmgmt.h

-${DEST}/lib/afs/libprocmgmt.a: libprocmgmt.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/procmgmt.h: ${srcdir}/procmgmt.h
-	${INSTALL} $? $@
+dest: libprocmgmt.a
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libprocmgmt.a ${DEST}/lib/afs/libprocmgmt.a
+	${INSTALL_DATA} ${srcdir}/procmgmt.h \
+		${DEST}/include/afs/procmgmt.h

 #
 # Misc targets
@ -39,17 +51,3 @@ clean:
 	$(RM) -f *.a *.o core AFS_component_version_number.c

 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/libprocmgmt.a: libprocmgmt.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libprocmgmt.a: libprocmgmt.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/procmgmt.h: ${srcdir}/procmgmt.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/procmgmt.h: ${srcdir}/procmgmt.h
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/afs/libprocmgmt.a ${DEST}/include/afs/procmgmt.h
-
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@ -54,6 +54,36 @@ depinstall: \
 	${TOP_INCDIR}/afs/ptint.h \
 	${TOP_INCDIR}/afs/ptserver.h

+${TOP_LIBDIR}/libprot.a: libprot.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/prclient.h: ptclient.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/prerror.h: pterror.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/print.h: ptint.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/prserver.h: ptserver.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/ptclient.h: ptclient.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/ptuser.h: ptuser.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/pterror.h: pterror.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/ptint.h: ptint.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/ptserver.h: ptserver.h
+	${INSTALL_DATA} $? $@
+
 #
 # Build targets
 #
@ -92,10 +122,10 @@ ptint.xdr.c: ptint.h

 Kptint.cs.c: ptint.xg Kptint.h
 	${RXGEN} -x -k -C -o Kptint.cs.c ${srcdir}/ptint.xg
- 
+
 Kptint.xdr.c: ptint.xg
 	${RXGEN} -x -k -c -o Kptint.xdr.c ${srcdir}/ptint.xg
- 
+
 Kptint.h: ptint.xg
 	${RXGEN} -x -k -h -o Kptint.h ${srcdir}/ptint.xg

@ -153,70 +183,58 @@ pt_util: pt_util.o ptutils.o ubik.o utils.o map.o libprot.a $(LIBS)
 ubik.o: ubik.c ${INCLS}

 prerror.h: pterror.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@
 	echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_PT' >> $@

 #
 # Installation targets
 #
-install: \
-	${DESTDIR}${afssrvlibexecdir}/ptserver \
-	${DESTDIR}${afssrvbindir}/pts \
-	${DESTDIR}${bindir}/pts \
-	${DESTDIR}${afssrvsbindir}/pt_util \
-	${DESTDIR}${afssrvsbindir}/prdb_check \
-	${DESTDIR}${libdir}/afs/libprot.a \
-	${DESTDIR}${includedir}/afs/prclient.h \
-	${DESTDIR}${includedir}/afs/prerror.h \
-	${DESTDIR}${includedir}/afs/print.h \
-	${DESTDIR}${includedir}/afs/prserver.h \
-	${DESTDIR}${includedir}/afs/ptclient.h \
-	${DESTDIR}${includedir}/afs/ptuser.h \
-	${DESTDIR}${includedir}/afs/pterror.h \
-	${DESTDIR}${includedir}/afs/ptint.h \
-	${DESTDIR}${includedir}/afs/ptserver.h
+install: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \
+		ptint.h ptserver.h
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL} -d ${DESTDIR}${afssrvbindir}
+	${INSTALL} -d ${DESTDIR}${afssrvsbindir}
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} ptserver ${DESTDIR}${afssrvlibexecdir}/ptserver
+	${INSTALL} pts ${DESTDIR}${afssrvbindir}/pts
+	${INSTALL} pts ${DESTDIR}${bindir}/pts
+	${INSTALL} pt_util ${DESTDIR}${afssrvsbindir}/pt_util
+	${INSTALL} db_verify ${DESTDIR}${afssrvsbindir}/prdb_check
+	${INSTALL_DATA} libprot.a ${DESTDIR}${libdir}/afs/libprot.a
+	${INSTALL_DATA} ptclient.h ${DESTDIR}${includedir}/afs/prclient.h
+	${INSTALL_DATA} pterror.h ${DESTDIR}${includedir}/afs/prerror.h
+	${INSTALL_DATA} ptint.h ${DESTDIR}${includedir}/afs/print.h
+	${INSTALL_DATA} ptserver.h ${DESTDIR}${includedir}/afs/prserver.h
+	${INSTALL_DATA} ptclient.h ${DESTDIR}${includedir}/afs/ptclient.h
+	${INSTALL_DATA} ptuser.h ${DESTDIR}${includedir}/afs/ptuser.h
+	${INSTALL_DATA} pterror.h ${DESTDIR}${includedir}/afs/pterror.h
+	${INSTALL_DATA} ptint.h ${DESTDIR}${includedir}/afs/ptint.h
+	${INSTALL_DATA} ptserver.h ${DESTDIR}${includedir}/afs/ptserver.h

-${DEST}/root.server/usr/afs/bin/ptserver: ptserver
-	${INSTALL} $? $@
-
-${DEST}/bin/pts ${DEST}/root.server/usr/afs/bin/pts: pts
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/pt_util: pt_util
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libprot.a: libprot.a
-	${INSTALL} $? $@
-
-${DEST}/etc/prdb_check: db_verify
-	${INSTALL} -f $? $@
-
-${DEST}/include/afs/prclient.h: ptclient.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/prerror.h: pterror.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/print.h: ptint.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/prserver.h: ptserver.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/ptserver.h: ptserver.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/ptint.h: ptint.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/pterror.h: pterror.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/ptclient.h: ptclient.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/ptuser.h: ptuser.h
-	${INSTALL} $? $@
+dest: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \
+		ptint.h ptserver.h
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} ptserver ${DEST}/root.server/usr/afs/bin/ptserver
+	${INSTALL} pts ${DEST}/root.server/usr/afs/bin/pts
+	${INSTALL} pts ${DEST}/bin/pts
+	${INSTALL} pt_util ${DEST}/root.server/usr/afs/bin/pt_util
+	${INSTALL} db_verify ${DEST}/etc/prdb_check
+	${INSTALL_DATA} libprot.a ${DEST}/lib/afs/libprot.a
+	${INSTALL_DATA} ptclient.h ${DEST}/include/afs/prclient.h
+	${INSTALL_DATA} pterror.h ${DEST}/include/afs/prerror.h
+	${INSTALL_DATA} ptint.h ${DEST}/include/afs/print.h
+	${INSTALL_DATA} ptserver.h ${DEST}/include/afs/prserver.h
+	${INSTALL_DATA} ptclient.h ${DEST}/include/afs/ptclient.h
+	${INSTALL_DATA} ptuser.h ${DEST}/include/afs/ptuser.h
+	${INSTALL_DATA} pterror.h ${DEST}/include/afs/pterror.h
+	${INSTALL_DATA} ptint.h ${DEST}/include/afs/ptint.h
+	${INSTALL_DATA} ptserver.h ${DEST}/include/afs/ptserver.h

 #
 # Misc. targets
@ -227,94 +245,3 @@ clean:
 	core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c

 include ../config/Makefile.version
-${DESTDIR}${afssrvlibexecdir}/ptserver: ptserver
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvbindir}/pts: pts
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/pts: pts
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/pt_util: pt_util
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/prdb_check: db_verify
-	${INSTALL} -f $? $@
-
-${DESTDIR}${libdir}/afs/libprot.a: libprot.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libprot.a: libprot.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/prclient.h: ptclient.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/prclient.h: ptclient.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/prerror.h: pterror.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/prerror.h: pterror.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/print.h: ptint.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/print.h: ptint.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/prserver.h: ptserver.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/prserver.h: ptserver.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ptclient.h: ptclient.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ptuser.h: ptuser.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ptclient.h: ptclient.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ptuser.h: ptuser.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/pterror.h: pterror.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/pterror.h: pterror.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ptint.h: ptint.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ptint.h: ptint.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ptserver.h: ptserver.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ptserver.h: ptserver.h
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/root.server/usr/afs/bin/ptserver \
-	${DEST}/root.server/usr/afs/bin/pts \
-	${DEST}/bin/pts \
-	${DEST}/root.server/usr/afs/bin/pt_util \
-	${DEST}/etc/prdb_check \
-	${DEST}/lib/afs/libprot.a \
-	${DEST}/include/afs/prclient.h \
-	${DEST}/include/afs/prerror.h \
-	${DEST}/include/afs/print.h \
-	${DEST}/include/afs/prserver.h \
-	${DEST}/include/afs/ptclient.h \
-	${DEST}/include/afs/ptuser.h \
-	${DEST}/include/afs/pterror.h \
-	${DEST}/include/afs/ptint.h \
-	${DEST}/include/afs/ptserver.h
--- a/src/rx/Makefile.in
+++ b/src/rx/Makefile.in
@ -18,23 +18,16 @@ XDROBJS_common = xdr.o xdr_array.o xdr_rx.o xdr_afsuuid.o

 XDROBJS = xdr_arrayn.o ${XDROBJS_common}

-XDROBJS_djgpp = xdr_rec.o xdr_stdio.o \
-	xdr_float.o  xdr_refernce.o  xdr_update.o \
-	xdr_mem.o ${XDROBJS_common}
-
 RXOBJS_common = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o \
 	rx_globals.o rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o rx_trace.o \
 	rx_conncache.o xdr_int32.o xdr_int64.o xdr_update.o xdr_refernce.o

 RXOBJS = ${RXOBJS_common} 
-RXOBJS_djgpp = ${RXOBJS_common} rx_xmit_nt.o

 MULTIOBJS = rx_multi.o

 LIBOBJS = ${RXOBJS} ${MULTIOBJS} ${XDROBJS}

-LIBOBJS_djgpp = ${RXOBJS_djgpp} ${MULTIOBJS} ${XDROBJS_djgpp}
-
 BASICINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
 	     rx_clock.h rx_queue.h rx_event.h

@ -47,11 +40,6 @@ all: \

 depinstall: includes

-install-djgpp: \
-	includes \
-	${TOP_INCDIR}/rx/rx_xmit_nt.h \
-	${TOP_LIBDIR}/librx-djgpp.a
-
 RX_component_version_number.c: AFS_component_version_number.c
 	sed 's/cml_version/rx_cml_version/' <AFS_component_version_number.c >RX_component_version_number.c

@ -93,15 +81,9 @@ librx.a: ${LIBOBJS} RX_component_version_number.o
 	$(AR) crv $@ ${LIBOBJS} RX_component_version_number.o
 	$(RANLIB) $@

-librx-djgpp.a: ${LIBOBJS_djgpp} RX_component_version_number.o
-	-$(RM) -f librx-djgpp.a
-	$(AR) crv librx-djgpp.a RX_component_version_number.o ${LIBOBJS_djgpp}
-	$(RANLIB) librx-djgpp.a
-
 #
 # Install targets
 #
-
 includes: \
 	${TOP_INCDIR}/rx/rx_packet.h \
 	${TOP_INCDIR}/rx/rx_prototypes.h \
@ -120,190 +102,95 @@ includes: \
 	${TOP_INCDIR}/rx/xdr_prototypes.h

 ${TOP_LIBDIR}/librx.a: librx.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/librx-djgpp.a: librx-djgpp.a
-	${INSTALL} $? ${TOP_LIBDIR}/librx-djgpp.a
-	${INSTALL} $? ${TOP_LIBDIR}/librx.a
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_packet.h: rx_packet.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_prototypes.h: rx_prototypes.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx.h: rx.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_user.h: rx_user.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_event.h: rx_event.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_queue.h: rx_queue.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_globals.h: rx_globals.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_clock.h: rx_clock.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_multi.h: rx_multi.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_pthread.h: rx_pthread.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_lwp.h: rx_lwp.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_misc.h: rx_misc.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_null.h: rx_null.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/xdr.h: xdr.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/xdr_prototypes.h: xdr_prototypes.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_INCDIR}/rx/rx_xmit_nt.h: rx_xmit_nt.h 
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

-install: \
-	${DESTDIR}${libdir}/librx.a \
-	${DESTDIR}${includedir}/rx/rx_packet.h \
-	${DESTDIR}${includedir}/rx/rx_prototypes.h \
-	${DESTDIR}${includedir}/rx/rx.h \
-	${DESTDIR}${includedir}/rx/rx_user.h \
-	${DESTDIR}${includedir}/rx/rx_event.h \
-	${DESTDIR}${includedir}/rx/rx_queue.h \
-	${DESTDIR}${includedir}/rx/rx_globals.h \
-	${DESTDIR}${includedir}/rx/rx_clock.h \
-	${DESTDIR}${includedir}/rx/rx_multi.h \
-	${DESTDIR}${includedir}/rx/rx_pthread.h \
-	${DESTDIR}${includedir}/rx/rx_lwp.h \
-	${DESTDIR}${includedir}/rx/rx_misc.h \
-	${DESTDIR}${includedir}/rx/rx_null.h \
-	${DESTDIR}${includedir}/rx/xdr.h \
-	${DESTDIR}${includedir}/rx/xdr_prototypes.h
+install: librx.a
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL} -d ${DESTDIR}${includedir}/rx
+	${INSTALL_DATA} librx.a ${DESTDIR}${libdir}/librx.a
+	${INSTALL_DATA} rx_packet.h ${DESTDIR}${includedir}/rx/rx_packet.h
+	${INSTALL_DATA} rx_prototypes.h ${DESTDIR}${includedir}/rx/rx_prototypes.h
+	${INSTALL_DATA} rx.h ${DESTDIR}${includedir}/rx/rx.h
+	${INSTALL_DATA} rx_user.h ${DESTDIR}${includedir}/rx/rx_user.h
+	${INSTALL_DATA} rx_event.h ${DESTDIR}${includedir}/rx/rx_event.h
+	${INSTALL_DATA} rx_queue.h ${DESTDIR}${includedir}/rx/rx_queue.h
+	${INSTALL_DATA} rx_globals.h ${DESTDIR}${includedir}/rx/rx_globals.h
+	${INSTALL_DATA} rx_clock.h ${DESTDIR}${includedir}/rx/rx_clock.h
+	${INSTALL_DATA} rx_multi.h ${DESTDIR}${includedir}/rx/rx_multi.h
+	${INSTALL_DATA} rx_pthread.h ${DESTDIR}${includedir}/rx/rx_pthread.h
+	${INSTALL_DATA} rx_lwp.h ${DESTDIR}${includedir}/rx/rx_lwp.h
+	${INSTALL_DATA} rx_misc.h ${DESTDIR}${includedir}/rx/rx_misc.h
+	${INSTALL_DATA} rx_null.h ${DESTDIR}${includedir}/rx/rx_null.h
+	${INSTALL_DATA} xdr.h ${DESTDIR}${includedir}/rx/xdr.h
+	${INSTALL_DATA} xdr_prototypes.h ${DESTDIR}${includedir}/rx/xdr_prototypes.h

-${DESTDIR}${libdir}/librx.a: librx.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_packet.h: rx_packet.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_prototypes.h: rx_prototypes.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx.h: rx.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_user.h: rx_user.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_event.h: rx_event.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_queue.h: rx_queue.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_globals.h: rx_globals.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_clock.h: rx_clock.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_multi.h: rx_multi.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_pthread.h: rx_pthread.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_lwp.h: rx_lwp.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_misc.h: rx_misc.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rx_null.h: rx_null.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/xdr_prototypes.h: xdr_prototypes.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/xdr.h: xdr.h
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/librx.a \
-	${DEST}/include/rx/rx_packet.h \
-	${DEST}/include/rx/rx_prototypes.h \
-	${DEST}/include/rx/rx.h \
-	${DEST}/include/rx/rx_user.h \
-	${DEST}/include/rx/rx_event.h \
-	${DEST}/include/rx/rx_queue.h \
-	${DEST}/include/rx/rx_globals.h \
-	${DEST}/include/rx/rx_clock.h \
-	${DEST}/include/rx/rx_multi.h \
-	${DEST}/include/rx/rx_pthread.h \
-	${DEST}/include/rx/rx_lwp.h \
-	${DEST}/include/rx/rx_misc.h \
-	${DEST}/include/rx/rx_null.h \
-	${DEST}/include/rx/xdr.h \
-	${DEST}/include/rx/xdr_prototypes.h
-
-${DEST}/lib/librx.a: librx.a
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_packet.h: rx_packet.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_prototypes.h: rx_prototypes.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx.h: rx.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_user.h: rx_user.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_event.h: rx_event.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_queue.h: rx_queue.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_globals.h: rx_globals.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_clock.h: rx_clock.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_multi.h: rx_multi.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_pthread.h: rx_pthread.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_lwp.h: rx_lwp.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_misc.h: rx_misc.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rx_null.h: rx_null.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/xdr.h: xdr.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/xdr_prototypes.h: xdr_prototypes.h
-	${INSTALL} $? $@
+dest: librx.a
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL} -d ${DEST}/include/rx
+	${INSTALL_DATA} librx.a ${DEST}/lib/librx.a
+	${INSTALL_DATA} rx_packet.h ${DEST}/include/rx/rx_packet.h
+	${INSTALL_DATA} rx_prototypes.h ${DEST}/include/rx/rx_prototypes.h
+	${INSTALL_DATA} rx.h ${DEST}/include/rx/rx.h
+	${INSTALL_DATA} rx_user.h ${DEST}/include/rx/rx_user.h
+	${INSTALL_DATA} rx_event.h ${DEST}/include/rx/rx_event.h
+	${INSTALL_DATA} rx_queue.h ${DEST}/include/rx/rx_queue.h
+	${INSTALL_DATA} rx_globals.h ${DEST}/include/rx/rx_globals.h
+	${INSTALL_DATA} rx_clock.h ${DEST}/include/rx/rx_clock.h
+	${INSTALL_DATA} rx_multi.h ${DEST}/include/rx/rx_multi.h
+	${INSTALL_DATA} rx_pthread.h ${DEST}/include/rx/rx_pthread.h
+	${INSTALL_DATA} rx_lwp.h ${DEST}/include/rx/rx_lwp.h
+	${INSTALL_DATA} rx_misc.h ${DEST}/include/rx/rx_misc.h
+	${INSTALL_DATA} rx_null.h ${DEST}/include/rx/rx_null.h
+	${INSTALL_DATA} xdr.h ${DEST}/include/rx/xdr.h
+	${INSTALL_DATA} xdr_prototypes.h ${DEST}/include/rx/xdr_prototypes.h

 #
 # Misc. targets
--- a/src/rxdebug/Makefile.in
+++ b/src/rxdebug/Makefile.in
@ -30,7 +30,13 @@ rxdebug: rxdebug.o ${LIBS}
 #
 # Install targets
 #
-install:  ${DESTDIR}${sbindir}/rxdebug
+install: rxdebug
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL_PROGRAM} rxdebug ${DESTDIR}${sbindir}/rxdebug
+
+dest: rxdebug
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL_PROGRAM} rxdebug ${DEST}/etc/rxdebug

 #
 # Misc. targets
@ -39,11 +45,3 @@ clean:
 	$(RM) -f *.o *.a core *_component_version_number.c rxdumptrace rxdebug

 include ../config/Makefile.version
-
-dest: ${DEST}/etc/rxdebug
-
-${DESTDIR}${sbindir}/rxdebug: rxdebug
-	${INSTALL} $? $@
-
-${DEST}/etc/rxdebug: rxdebug
-	${INSTALL} $? $@
--- a/src/rxgen/Makefile.in
+++ b/src/rxgen/Makefile.in
@ -15,19 +15,27 @@ OBJS= rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o rpc_scan.o rpc_util.o \

 all: rxgen ${TOP_INCDIR}/afs/rxgen_consts.h

+${TOP_INCDIR}/afs/rxgen_consts.h: rxgen_consts.h
+	${INSTALL_DATA} $? $@
+
 rxgen: $(OBJS) AFS_component_version_number.c $(HDRS)
 	$(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@

 #
 # Install targets
 #
-install:  ${DESTDIR}${bindir}/rxgen ${DESTDIR}${includedir}/afs/rxgen_consts.h
+install: rxgen rxgen_consts.h
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_PROGRAM} rxgen ${DESTDIR}${bindir}/rxgen
+	${INSTALL_DATA} rxgen_consts.h \
+		${DESTDIR}${includedir}/afs/rxgen_consts.h

-${DEST}/bin/rxgen: rxgen
-	${INSTALL} $? $@
-
-${DEST}/include/afs/rxgen_consts.h: rxgen_consts.h
-	${INSTALL} $? $@
+dest: rxgen rxgen_consts.h
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_PROGRAM} rxgen ${DEST}/bin/rxgen
+	${INSTALL_DATA} rxgen_consts.h ${DEST}/include/afs/rxgen_consts.h

 #
 # Misc. targets
@ -36,15 +44,3 @@ clean:
 	$(RM) -f *.o rxgen core AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${bindir}/rxgen: rxgen
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/rxgen_consts.h: rxgen_consts.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/rxgen_consts.h: rxgen_consts.h
-	${INSTALL} $? $@
-
-dest:  ${DEST}/bin/rxgen ${DEST}/include/afs/rxgen_consts.h
-
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@ -36,31 +36,21 @@ depinstall: \
 	${TOP_INCDIR}/rx/rxkad_prototypes.h \
 	${TOP_INCDIR}/rx/fcrypt.h

-#
-# Install targets
-#
-install:   \
-	${DESTDIR}${libdir}/librxkad.a \
-	${DESTDIR}${includedir}/rx/fcrypt.h \
-	${DESTDIR}${includedir}/rx/rxkad.h \
-	${DESTDIR}${includedir}/rx/rxkad_prototypes.h
+${TOP_LIBDIR}/librxkad.a: librxkad.a
+	${INSTALL_DATA} $? $@

-${DEST}/lib/librxkad.a: librxkad.a
-	${INSTALL} $? $@
+${TOP_INCDIR}/rx/fcrypt.h: fcrypt.h
+	${INSTALL_DATA} $? $@

-${DEST}/include/rx/fcrypt.h: fcrypt.h
-	${INSTALL} $? $@
+${TOP_INCDIR}/rx/rxkad.h: rxkad.h
+	${INSTALL_DATA} $? $@

-${DEST}/include/rx/rxkad.h: rxkad.h
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rxkad_prototypes.h: rxkad_prototypes.h
-	${INSTALL} $? $@
+${TOP_INCDIR}/rx/rxkad_prototypes.h: rxkad_prototypes.h
+	${INSTALL_DATA} $? $@

 #
 # Build targets
 #
-
 librxkad.a: ${OBJS} AFS_component_version_number.o
 	-$(RM) -f $@
 	$(AR) crv $@ ${OBJS} AFS_component_version_number.o
@ -85,7 +75,7 @@ ticket5.o: ticket5.c v5gen.c v5der.c v5gen-rewrite.h ${INCLS}
 crc.o: crc.c ${INCLS}

 md4.o: md4.c ${INCLS}
- 
+
 md5.o: md5.c ${INCLS}

 fcrypt.o: ${srcdir}/domestic/fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h
@ -105,10 +95,30 @@ fc_test: ${fc_test_OBJS} ${fc_test_LIBS}

 fc_test.o: ${INCLS}

+#
+# Install targets
+#
+install: librxkad.a fcrypt.h rxkad.h rxkad_prototypes.h
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL} -d ${DESTDIR}${includedir}/rx
+	${INSTALL_DATA} librxkad.a ${DESTDIR}${libdir}/librxkad.a
+	${INSTALL_DATA} fcrypt.h ${DESTDIR}${includedir}/rx/fcrypt.h
+	${INSTALL_DATA} rxkad.h ${DESTDIR}${includedir}/rx/rxkad.h
+	${INSTALL_DATA} rxkad_prototypes.h \
+		${DESTDIR}${includedir}/rx/rxkad_prototypes.h
+
+dest: librxkad.a fcrypt.h rxkad.h rxkad_prototypes.h
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL} -d ${DEST}/include/rx
+	${INSTALL_DATA} librxkad.a ${DEST}/lib/librxkad.a
+	${INSTALL_DATA} fcrypt.h ${DEST}/include/rx/fcrypt.h
+	${INSTALL_DATA} rxkad.h ${DEST}/include/rx/rxkad.h
+	${INSTALL_DATA} rxkad_prototypes.h \
+		${DEST}/include/rx/rxkad_prototypes.h
+
 #
 # Misc. targets
 #
-
 clean: 
 	$(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \
 		AFS_component_version_number.c \
@ -117,43 +127,14 @@ clean:

 test:
 	cd test; $(MAKE)
+
 # These sources are kept in a separate directory so that we can use an
 # ACL to comply with source export restrictions.

 fcrypt.h: domestic/fcrypt.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 sboxes.h: domestic/sboxes.h
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 include ../config/Makefile.version
-${DESTDIR}${libdir}/librxkad.a: librxkad.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/librxkad.a: librxkad.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/fcrypt.h: fcrypt.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rxkad.h: rxkad.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/rx/rxkad_prototypes.h: rxkad_prototypes.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/rx/fcrypt.h: fcrypt.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/rx/rxkad.h: rxkad.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/rx/rxkad_prototypes.h: rxkad_prototypes.h
-	${INSTALL} $? $@
-
-dest:   \
-	${DEST}/lib/librxkad.a \
-	${DEST}/include/rx/fcrypt.h \
-	${DEST}/include/rx/rxkad.h \
-	${DEST}/include/rx/rxkad_prototypes.h
-
--- a/src/rxstat/Makefile.in
+++ b/src/rxstat/Makefile.in
@ -15,6 +15,12 @@ all: depinstall ${TOP_LIBDIR}/librxstat.a
 depinstall: \
 	${TOP_INCDIR}/rx/rxstat.h Krxstat.cs.c Krxstat.ss.c Krxstat.xdr.c

+${TOP_INCDIR}/rx/rxstat.h: rxstat.h
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/librxstat.a: librxstat.a
+	${INSTALL_DATA} $? $@
+
 #
 # Build targets
 #
@ -51,13 +57,17 @@ Krxstat.xdr.c: rxstat.xg
 #
 # Install targets
 #
-install:   ${DESTDIR}${includedir}/rx/rxstat.h ${DESTDIR}${libdir}/librxstat.a
+install: rxstat.h librxstat.a
+	${INSTALL} -d ${DESTDIR}${includedir}/rx
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL_DATA} rxstat.h ${DESTDIR}${includedir}/rx/rxstat.h
+	${INSTALL_DATA} librxstat.a ${DESTDIR}${libdir}/librxstat.a

-${DEST}/lib/librxstat.a: librxstat.a
-	${INSTALL} $? $@
-
-${DEST}/include/rx/rxstat.h: rxstat.h
-	${INSTALL} $? $@
+dest: rxstat.h librxstat.a
+	${INSTALL} -d ${DEST}/include/rx
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL_DATA} rxstat.h ${DEST}/include/rx/rxstat.h
+	${INSTALL_DATA} librxstat.a ${DEST}/lib/librxstat.a

 #
 # Misc. targets
@ -66,17 +76,3 @@ clean:
 	$(RM) -f rxstat.h *.xdr.c *.cs.c *.ss.c *.o *.a core AFS_component_version_number.c

 include ../config/Makefile.version
-${DESTDIR}${includedir}/rx/rxstat.h: rxstat.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/rx/rxstat.h: rxstat.h
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/librxstat.a: librxstat.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/librxstat.a: librxstat.a
-	${INSTALL} $? $@
-
-dest:   ${DEST}/include/rx/rxstat.h ${DEST}/lib/librxstat.a
-
--- a/src/scout/Makefile.in
+++ b/src/scout/Makefile.in
@ -54,10 +54,13 @@ scout: scout.o $(LIBS)
 #
 # Installation targets
 #
-install: ${DESTDIR}${bindir}/scout
+install: scout
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL_PROGRAM} scout ${DESTDIR}${bindir}/scout

-${DEST}/bin/scout: scout
-	${INSTALL} $? $@
+dest: scout
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL_PROGRAM} scout ${DEST}/bin/scout

 #
 # Misc targets
@ -66,9 +69,3 @@ clean:
 	$(RM) -f *.o scout core AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${bindir}/scout: scout
-	${INSTALL} $? $@
-
-dest: ${DEST}/bin/scout
-
--- a/src/sgistuff/Makefile.in
+++ b/src/sgistuff/Makefile.in
@ -32,7 +32,23 @@ TARGETS=$(AUTHLIBS)

 all: ${TOP_LIBDIR}/afsauthlib.so ${TOP_LIBDIR}/afskauthlib.so

-install install.noversion: ${DESTDIR}${libdir}/afsauthlib.so ${DESTDIR}${libdir}/afskauthlib.so
+${TOP_LIBDIR}/afsauthlib.so: afsauthlib.so
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/afskauthlib.so: afskauthlib.so
+	${INSTALL_DATA} $? $@
+
+install install.noversion: afsauthlib.so afskauthlib.so
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL_DATA} afsauthlib.so ${DESTDIR}${libdir}/afsauthlib.so
+	${INSTALL_DATA} afskauthlib.so ${DESTDIR}${libdir}/afskauthlib.so
+
+dest: afsauthlib.so afskauthlib.so
+	${INSTALL} -d ${DEST}/root.client/usr/vice/etc
+	${INSTALL_DATA} afsauthlib.so \
+		${DEST}/root.client/usr/vice/etc/afsauthlib.so
+	${INSTALL_DATA} afskauthlib.so \
+		${DEST}/root.client/usr/vice/etc/afskauthlib.so

 clean:
 	$(RM) -f $(AUTHLIBS) $(AUTHFILES) 
@ -54,24 +70,3 @@ herror.o: herror.c

 sgi_auth.o: sgi_auth.c
 	${CC} ${CFLAGS} -c sgi_auth.c
-
-${TOP_LIBDIR}/afsauthlib.so: afsauthlib.so
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/afskauthlib.so: afskauthlib.so
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afsauthlib.so: afsauthlib.so
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afskauthlib.so: afskauthlib.so
-	${INSTALL} $? $@
-
-${DEST}/root.client/usr/vice/etc/afsauthlib.so: afsauthlib.so
-	${INSTALL} $? $@
-
-${DEST}/root.client/usr/vice/etc/afskauthlib.so: afskauthlib.so
-	${INSTALL} $? $@
-
-dest: ${DEST}/root.client/usr/vice/etc/afsauthlib.so ${DEST}/root.client/usr/vice/etc/afskauthlib.so
-
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@ -99,14 +99,22 @@ LIBOBJS = \

 LIBAFSAUTHENT = libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR}.${LIBAFSAUTHENTMINOR}

-${DEST}/lib/${LIBAFSAUTHENT}: ${LIBAFSAUTHENT}
-	${INSTALL} ${LIBAFSAUTHENT} ${DEST}/lib/${LIBAFSAUTHENT}
-	-ln -f -s ${LIBAFSAUTHENT} ${DEST}/lib/libafsauthent.${SHLIB_SUFFIX}
-	-ln -f -s ${LIBAFSAUTHENT} ${DEST}/lib/libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR}
-
 all: ${TOP_LIBDIR}/${LIBAFSAUTHENT}

-install: ${DESTDIR}${libdir}/${LIBAFSAUTHENT}
+${TOP_LIBDIR}/${LIBAFSAUTHENT}: ${LIBAFSAUTHENT}
+	${INSTALL_DATA} ${LIBAFSAUTHENT} ${TOP_LIBDIR}/${LIBAFSAUTHENT}
+	-ln -f -s ${LIBAFSAUTHENT} ${TOP_LIBDIR}/libafsauthent.${SHLIB_SUFFIX}
+	-ln -f -s ${LIBAFSAUTHENT} ${TOP_LIBDIR}/libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR}
+
+install: ${LIBAFSAUTHENT}
+	${INSTALL_DATA} ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/${LIBAFSAUTHENT}
+	-ln -f -s ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/libafsauthent.${SHLIB_SUFFIX}
+	-ln -f -s ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/libafsauthent.${SHLIB_SUFFIX}.${LIBFASAUTHENTMAJOR}
+
+dest: ${LIBAFSAUTHENT}
+	${INSTALL_DATA} ${LIBAFSAUTHENT} ${DEST}/lib/${LIBAFSAUTHENT}
+	-ln -f -s ${LIBAFSAUTHENT} ${DEST}/lib/libafsauthent.${SHLIB_SUFFIX}
+	-ln -f -s ${LIBAFSAUTHENT} ${DEST}/lib/libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR}

 ${LIBAFSAUTHENT}: ${LIBOBJS}
 	case ${SYS_NAME} in \
@ -270,15 +278,3 @@ setpag.o: ${SYS}/setpag.c

 clean:
 	$(RM) -f *.o *.a libafsauthent*
-
-${DESTDIR}${libdir}/${LIBAFSAUTHENT}: ${LIBAFSAUTHENT}
-	${INSTALL} ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/${LIBAFSAUTHENT}
-	-ln -f -s ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/libafsauthent.${SHLIB_SUFFIX}
-	-ln -f -s ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/libafsauthent.${SHLIB_SUFFIX}.${LIBFASAUTHENTMAJOR}
-
-${TOP_LIBDIR}/${LIBAFSAUTHENT}: ${LIBAFSAUTHENT}
-	${INSTALL} ${LIBAFSAUTHENT} ${TOP_LIBDIR}/${LIBAFSAUTHENT}
-	-ln -f -s ${LIBAFSAUTHENT} ${TOP_LIBDIR}/libafsauthent.${SHLIB_SUFFIX}
-	-ln -f -s ${LIBAFSAUTHENT} ${TOP_LIBDIR}/libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR}
-
-dest: ${DEST}/lib/${LIBAFSAUTHENT}
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@ -136,10 +136,18 @@ LIBAFSRPC = libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}.${LIBAFSRPCMINOR}

 all: ${TOP_LIBDIR}/${LIBAFSRPC}

-install: ${DESTDIR}${libdir}/${LIBAFSRPC}
+${TOP_LIBDIR}/${LIBAFSRPC}: ${LIBAFSRPC}
+	${INSTALL_DATA} ${LIBAFSRPC} ${TOP_LIBDIR}/${LIBAFSRPC}
+	-ln -f -s ${LIBAFSRPC} ${TOP_LIBDIR}/libafsrpc.${SHLIB_SUFFIX}
+	-ln -f -s ${LIBAFSRPC} ${TOP_LIBDIR}/libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}

-${DEST}/lib/${LIBAFSRPC}: ${LIBAFSRPC}
-	${INSTALL} ${LIBAFSRPC} ${DEST}/lib/${LIBAFSRPC}
+install: ${LIBAFSRPC}
+	${INSTALL_DATA} ${LIBAFSRPC} ${DESTDIR}${libdir}/${LIBAFSRPC}
+	-ln -f -s ${LIBAFSRPC} ${DESTDIR}${libdir}/libafsrpc.${SHLIB_SUFFIX}
+	-ln -f -s ${LIBAFSRPC} ${DESTDIR}${libdir}/libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}
+
+dest: ${LIBAFSRPC}
+	${INSTALL_DATA} ${LIBAFSRPC} ${DEST}/lib/${LIBAFSRPC}
 	-ln -f -s ${LIBAFSRPC} ${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}
 	-ln -f -s ${LIBAFSRPC} ${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}

@ -410,16 +418,3 @@ afsaux.o: ${FSINT}/afsaux.c

 clean:
 	$(RM) -f *.o libafsrpc*
-
-${DESTDIR}${libdir}/${LIBAFSRPC}: ${LIBAFSRPC}
-	${INSTALL} ${LIBAFSRPC} ${DESTDIR}${libdir}/${LIBAFSRPC}
-	-ln -f -s ${LIBAFSRPC} ${DESTDIR}${libdir}/libafsrpc.${SHLIB_SUFFIX}
-	-ln -f -s ${LIBAFSRPC} ${DESTDIR}${libdir}/libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}
-
-${TOP_LIBDIR}/${LIBAFSRPC}: ${LIBAFSRPC}
-	${INSTALL} ${LIBAFSRPC} ${TOP_LIBDIR}/${LIBAFSRPC}
-	-ln -f -s ${LIBAFSRPC} ${TOP_LIBDIR}/libafsrpc.${SHLIB_SUFFIX}
-	-ln -f -s ${LIBAFSRPC} ${TOP_LIBDIR}/libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}
-
-dest: ${DEST}/lib/${LIBAFSRPC}
-
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@ -23,9 +23,6 @@ OBJECTS= afssyscalls.o setpag.o glue.o syscall.o
 SHLIBOBJS = picobj/setpag.o picobj/glue.o syscall.o
 RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o 

-LIBAFSSETPAG = libafssetpag.${SHLIB_SUFFIX}.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}
-LIBAFSSETPAG_DARWIN = libafssetpag.${LIBAFSSETPAGMAJOR}.${SHLIB_SUFFIX}
-
 all: \
    rmtsysd \
    pagsh \
@ -35,17 +32,53 @@ all: \
    ${TOP_INCDIR}/afs/xfsattrs.h \
    ${TOP_LIBDIR}/afs.exp \
    ${TOP_LIBDIR}/libsys.a \
-    ${KERNELDIR}/afs \
    ${KERNELDIR}/afs/xfsattrs.h \
-    ${UKERNELDIR}/afs \
    ${UKERNELDIR}/afs/afsl.exp
+
+${TOP_INCDIR}/afs/afssyscalls.h: afssyscalls.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/rmtsys.h: rmtsys.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/afs.exp: afs.exp
 	@set -x; case ${SYS_NAME} in \
-	*_darwin_*) \
-	    ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}';; \
-	*) \
-	    ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG}';; \
+		rs_aix* ) \
+			${INSTALL_DATA} $? $@ ;; \
 	esac

+${TOP_LIBDIR}/afs.exp: afs.exp
+	@set -x; case ${SYS_NAME} in \
+		rs_aix* ) \
+			${INSTALL_DATA} $? $@ ;; \
+	esac
+
+${TOP_INCDIR}/afs/xfsattrs.h: xfsattrs.h
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libsys.a: libsys.a
+	${INSTALL_DATA} $? $@
+
+${UKERNELDIR}/afs/afsl.exp: afsl.exp
+	${INSTALL} -d ${UKERNELDIR}/afs
+	@set -x; case ${SYS_NAME} in \
+		rs_aix* ) \
+			${INSTALL_DATA} $? $@ ;; \
+	esac
+
+${KERNELDIR}/afs/xfsattrs.h: xfsattrs.h
+	${INSTALL} -d ${KERNELDIR}/afs
+	${INSTALL_DATA} $? $@
+
+depinstall: \
+	${TOP_INCDIR}/afs/afssyscalls.h \
+	${TOP_INCDIR}/afs/rmtsys.h \
+	${TOP_INCDIR}/afs/afs.exp \
+	${TOP_INCDIR}/afs/xfsattrs.h \
+	${KERNELDIR}/afs/xfsattrs.h \
+	${UKERNELDIR}/afs/afsl.exp \
+	Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c rmtsys.h 
+
 libsys.a: ${OBJECTS} ${RMTOBJS} afsl.exp AFS_component_version_number.o
 	-$(RM) -f $@
 	$(AR) crv $@ ${OBJECTS} ${RMTOBJS} \
@ -56,25 +89,6 @@ libsys.a: ${OBJECTS} ${RMTOBJS} afsl.exp AFS_component_version_number.o
 			$(AR) crv $@ afsl.exp;;         \
 	esac

-${LIBAFSSETPAG}: ${SHLIBOBJS}
-	@set -x; case ${SYS_NAME} in \
-	*_linux*) \
-	    ${SHLIB_LINKER} -Wl,-h,libafssetpag.so.${LIBAFSSETPAGMAJOR} \
-	        -o ${LIBAFSSETPAG} -Wl,--version-script=${srcdir}/mapfile \
-	        ${SHLIBOBJS};; \
-	rs_aix4*) \
-	    ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS} \
-	        -bE:afssetpag.exp;; \
-	sun*_5*) \
-	    ${SHLIB_LINKER} -h libafssetpag.so.${LIBAFSSETPAGMAJOR} \
-	        -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
-	*) \
-	    ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
-	esac
-
-${LIBAFSSETPAG_DARWIN}: ${SHLIBOBJS}
-	${SHLIB_LINKER} -o ${LIBAFSSETPAG_DARWIN} ${ARCHFLAGS} -install_name ${libdir}/${LIBAFSSETPAG_DARWIN} -compatibility_version ${LIBAFSSETPAGMAJOR} -current_version ${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR} ${SHLIBOBJS}
-
 tests:	pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd

 syscall.o: syscall.s
@ -110,20 +124,6 @@ glue.o: glue.c afssyscalls.h
 setpag.o: setpag.c afssyscalls.h
 	${CCOBJ} ${CFLAGS} -c ${srcdir}/setpag.c

-picobj: afssyscalls.h
-	mkdir -p picobj
-	cp ${srcdir}/afssyscalls.h picobj/afssyscalls.h
-
-picobj/glue.o: picobj glue.c afssyscalls.h
-	rm -f picobj/glue.c
-	cp ${srcdir}/glue.c picobj/glue.c
-	cd picobj && ${CCOBJ} ${CFLAGS} ${SHLIB_CFLAGS} -c glue.c
-
-picobj/setpag.o: picobj setpag.c afssyscalls.h
-	rm -f picobj/setpag.c
-	cp ${srcdir}/setpag.c picobj/setpag.c
-	cd picobj && ${CCOBJ} ${CFLAGS} ${SHLIB_CFLAGS} -c setpag.c
-
 rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h
 rmtsysd: AFS_component_version_number.o afs.exp afsl.exp

@ -194,17 +194,6 @@ xfsinode: xfsinode.c  AFS_component_version_number.c
 		$(CC) -o xfsinode ${CFLAGS} ${srcdir}/xfsinode.c ${LIBS}
 	esac

-${TOP_LIBDIR}/${LIBAFSSETPAG}: ${LIBAFSSETPAG}
-	${INSTALL} ${LIBAFSSETPAG} ${TOP_LIBDIR}/${LIBAFSSETPAG}
-	-ln -f -s ${LIBAFSSETPAG} ${TOP_LIBDIR}/libafssetpag.${SHLIB_SUFFIX}
-	-ln -f -s ${LIBAFSSETPAG} ${TOP_LIBDIR}/libafssetpag.${SHLIB_SUFFIX}.${LIBAFSSETPAGMAJOR}
-
-${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}: ${LIBAFSSETPAG_DARWIN}
-	${INSTALL} ${LIBAFSSETPAG_DARWIN} ${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}
-	-ln -f -s ${LIBAFSSETPAG_DARWIN} ${TOP_LIBDIR}/libafssetpag.${SHLIB_SUFFIX}
-	-ln -f -s ${LIBAFSSETPAG_DARWIN} ${TOP_LIBDIR}/libafssetpag.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}.${SHLIB_SUFFIX}
- 
-
 afs.exp: ${srcdir}/afs4.exp ${srcdir}/afs5.exp
 	@set -x; case ${SYS_NAME} in \
 		rs_aix5* ) \
@ -228,147 +217,37 @@ afsl.exp: ${srcdir}/afsl4.exp ${srcdir}/afsl5.exp
 #
 # Installation targets
 #
-
-${TOP_INCDIR}/afs/afssyscalls.h: afssyscalls.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/rmtsys.h: rmtsys.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/afs.exp: afs.exp
+install: libsys.a rmtsysd afssyscalls.h pagsh pagsh.krb afs.exp xfsattrs.h
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libsys.a ${DESTDIR}${libdir}/afs/libsys.a
+	${INSTALL_PROGRAM} rmtsysd ${DESTDIR}${sbindir}/rmtsysd
+	${INSTALL_DATA} afssyscalls.h ${DESTDIR}${includedir}/afs/afssyscalls.h
+	${INSTALL_PROGRAM} pagsh ${DESTDIR}${bindir}/pagsh
+	${INSTALL_PROGRAM} pagsh.krb ${DESTDIR}${bindir}/pagsh.krb
+	${INSTALL_DATA} xfsattrs.h ${DESTDIR}${includedir}/afs/xfsattrs.h
 	@set -x; case ${SYS_NAME} in \
-		rs_aix* ) \
-			${INSTALL} $? $@ ;; \
+	rs_aix*) \
+		${INSTALL_DATA} afs.exp ${DESTDIR}${includedir}/afs/afs.exp;; \
 	esac

-${TOP_LIBDIR}/afs.exp: afs.exp
+dest: libsys.a rmtsysd afssyscalls.h pagsh pagsh.krb afs.exp xfsattrs.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libsys.a ${DEST}/lib/afs/libsys.a
+	${INSTALL_PROGRAM} rmtsysd ${DEST}/etc/rmtsysd
+	${INSTALL_PROGRAM} pagsh ${DEST}/bin/pagsh
+	${INSTALL_PROGRAM} pagsh.krb ${DEST}/bin/pagsh.krb
+	${INSTALL_DATA} afssyscalls.h ${DEST}/include/afs/afssyscalls.h
+	${INSTALL_DATA} xfsattrs.h ${DEST}/include/afs/xfsattrs.h
 	@set -x; case ${SYS_NAME} in \
-		rs_aix* ) \
-			${INSTALL} $? $@ ;; \
+	rs_aix*) \
+		${INSTALL_DATA} afs.exp ${DEST}/include/afs/afs.exp ;; \
 	esac

-${TOP_INCDIR}/afs/xfsattrs.h: xfsattrs.h
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libsys.a: libsys.a
-	${INSTALL} $? $@
-
-${UKERNELDIR}/afs:
-	mkdir -p $@
-
-${UKERNELDIR}/afs/afsl.exp: afsl.exp
-	@set -x; case ${SYS_NAME} in \
-		rs_aix* ) \
-			${INSTALL} $? $@ ;; \
-	esac
-
-${KERNELDIR}/afs:
-	mkdir -p $@
-
-${KERNELDIR}/afs/xfsattrs.h: xfsattrs.h
-	${INSTALL} $? $@
-
-depinstall: \
-	${TOP_INCDIR}/afs/afssyscalls.h \
-	${TOP_INCDIR}/afs/rmtsys.h \
-	${TOP_INCDIR}/afs/afs.exp \
-	${TOP_INCDIR}/afs/xfsattrs.h \
-	${KERNELDIR}/afs/xfsattrs.h \
-	${UKERNELDIR}/afs/afsl.exp \
-	Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c rmtsys.h 
-
-install: \
-    ${DESTDIR}${libdir}/afs/libsys.a \
-    ${DESTDIR}${sbindir}/rmtsysd \
-    ${DESTDIR}${includedir}/afs/afssyscalls.h \
-    ${DESTDIR}${bindir}/pagsh \
-    ${DESTDIR}${bindir}/pagsh.krb \
-    ${DESTDIR}${includedir}/afs/afs.exp \
-    ${DESTDIR}${includedir}/afs/xfsattrs.h
-	@set -x; case ${SYS_NAME} in \
-	*_darwin_*) \
-	    ${MAKE} '${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}';; \
-	*) \
-	    ${MAKE} '${DESTDIR}${libdir}/${LIBAFSSETPAG}';; \
-	esac
-
-${DESTDIR}${libdir}/afs/libsys.a: libsys.a
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/${LIBAFSSETPAG}: ${LIBAFSSETPAG}
-	${INSTALL} ${LIBAFSSETPAG} ${DESTDIR}${libdir}/${LIBAFSSETPAG}
-	-ln -f -s ${LIBAFSSETPAG} \
-	    ${DESTDIR}${libdir}/libafssetpag.${SHLIB_SUFFIX}
-	-ln -f -s ${LIBAFSSETPAG} \
-	    ${DESTDIR}${libdir}/libafssetpag.${SHLIB_SUFFIX}.${LIBAFSSETPAGMAJOR}
-
-${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}: ${LIBAFSSETPAG_DARWIN}
-	${INSTALL} ${LIBAFSSETPAG_DARWIN} ${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}
-	-ln -f -s ${LIBAFSSETPAG_DARWIN} \
-		${DESTDIR}${libdir}/libafssetpag.${SHLIB_SUFFIX} ; \
-	-ln -f -s ${LIBAFSSETPAG_DARWIN} \
-		${DESTDIR}${libdir}/libafssetpag.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}.${SHLIB_SUFFIX} ;; \
-
-${DESTDIR}${sbindir}/rmtsysd: rmtsysd
-	${INSTALL} -s $? $@
-
-${DESTDIR}${includedir}/afs/afssyscalls.h: afssyscalls.h
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/pagsh: pagsh
-	${INSTALL} -s $? $@
-
-${DESTDIR}${bindir}/pagsh.krb: pagsh.krb
-	${INSTALL} -s $? $@
-
-${DESTDIR}${includedir}/afs/afs.exp: afs.exp
-	@set -x; case ${SYS_NAME} in \
-		rs_aix* ) \
-			${INSTALL} $? $@ ;; \
-	esac
-
-${DESTDIR}${includedir}/afs/xfsattrs.h: xfsattrs.h
-	${INSTALL} $? $@
-
-dest: \
-    ${DEST}/lib/afs/libsys.a \
-    ${DEST}/etc/rmtsysd \
-    ${DEST}/bin/pagsh \
-    ${DEST}/bin/pagsh.krb \
-    ${DEST}/include/afs/afssyscalls.h \
-    ${DEST}/include/afs/afs.exp \
-    ${DEST}/include/afs/xfsattrs.h
-	@set -x; case ${SYS_NAME} in \
-	*_darwin_*) \
-	    ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}';; \
-	*) \
-	    ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG}';; \
-	esac
-
-${DEST}/lib/afs/libsys.a: libsys.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs.exp: afs.exp
-	@set -x; case ${SYS_NAME} in \
-		rs_aix* ) \
-			${INSTALL} $? $@ ;; \
-	esac
-
-${DEST}/include/afs/xfsattrs.h: xfsattrs.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afssyscalls.h: afssyscalls.h
-	${INSTALL} $? $@
-
-${DEST}/etc/rmtsysd: rmtsysd
-	${INSTALL} -s $? $@
-
-${DEST}/bin/pagsh: pagsh
-	${INSTALL} -s $? $@
-
-${DEST}/bin/pagsh.krb: pagsh.krb
-	${INSTALL} -s $? $@
-
 #
 # Misc targets
 #
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@ -124,20 +124,18 @@ file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS}
 #
 # Install targets
 #
-install: ${DESTDIR}${sbindir}/butc
-dest: ${DEST}/etc/butc
+install: butc
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL_PROGRAM} butc ${DESTDIR}${sbindir}/butc

-${DEST}/etc/butc: butc
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/butc: butc
-	${INSTALL} $? $@
+dest: butc
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL_PROGRAM} butc ${DEST}/etc/butc

 #
 # Misc targets
 #
-include ../config/Makefile.version
-
 clean:
 	$(RM) -f *.o *.a core AFS_component_version_number.c butc

+include ../config/Makefile.version
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@ -75,35 +75,11 @@ backuphdr.o directory.o parsedump.o parsetag.o: dumpscan_errs.h
 parsevnode.o parsevol.o pathname.o repair.o:    dumpscan_errs.h
 stagehdr.o util.o:                              dumpscan_errs.h

-${DEST}/etc/afsdump_scan: afsdump_scan
-	${INSTALL} $? $@
-
-${DEST}/etc/afsdump_dirlist: afsdump_dirlist
-	${INSTALL} $? $@
-
-${DEST}/etc/afsdump_extract: afsdump_extract
-	${INSTALL} $? $@
-
-${DEST}/etc/dumptool: dumptool
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/afsdump_scan: afsdump_scan
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/afsdump_dirlist: afsdump_dirlist
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/afsdump_extract: afsdump_extract
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/dumptool: dumptool
-	${INSTALL} $? $@
-
 ${TOP_LIBDIR}/libxfiles.a: libxfiles.a
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 ${TOP_LIBDIR}/libdumpscan.a: libdumpscan.a
-	${INSTALL} $? $@
+	${INSTALL_DATA} $? $@

 SYS_LIBS	= ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a

--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@ -47,14 +47,6 @@ SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIR

 LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libcmd.a

-INSTALL_TARGS = ${DESTDIR}${afssrvlibexecdir}/salvageserver \
-		${DESTDIR}${afssrvsbindir}/fssync-debug \
-		${DESTDIR}${afssrvsbindir}/salvsync-debug
-
-DEST_TARGS =	${DEST}/root.server/usr/afs/bin/salvageserver \
-		${DEST}/root.server/usr/afs/bin/fssync-debug \
-		${DEST}/root.server/usr/afs/bin/salvsync-debug
-
 all: salvageserver fssync-debug salvsync-debug

 salvaged.o: ${VOL}/salvaged.c
@ -172,29 +164,26 @@ fssync-debug: ${FSSDEBUG_OBJS} ${LIBS}
 salvsync-debug: ${SSSDEBUG_OBJS} ${LIBS}
 	${CC} ${LDFLAGS} -o salvsync-debug ${SSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS}

-${DEST}/root.server/usr/afs/bin/salvageserver: salvageserver
-	${INSTALL} -ns $? $@
+install: salvageserver fssync-debug salvsync-debug
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL} -d ${DESTDIR}${afssrvsbindir}
+	${INSTALL_PROGRAM} salvageserver \
+		${DESTDIR}${afssrvlibexecdir}/salvageserver
+	${INSTALL_PROGRAM} fssync-debug \
+		${DESTDIR}${afssrvsbindir}/fssync-debug
+	${INSTALL_PROGRAM} salvsync-debug \
+		${DESTDIR}${afssrvsbindir}/salvsync-debug

-${DEST}/root.server/usr/afs/bin/fssync-debug: fssync-debug
-	${INSTALL} -s $? $@
-
-${DEST}/root.server/usr/afs/bin/salvsync-debug: salvsync-debug
-	${INSTALL} -s $? $@
-
-install: ${INSTALL_TARGS}
+dest: salvageserver fssync-debug salvsync-debug
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_PROGRAM} salvageserver \
+		${DEST}/root.server/usr/afs/bin/salvageserver
+	${INSTALL_PROGRAM} fssync-debug \
+		${DEST}/root.server/usr/afs/bin/fssync-debug
+	${INSTALL_PROGRAM} salvsync-debug \
+		${DEST}/root.server/usr/afs/bin/salvsync-debug

 clean:
 	$(RM) -f *.o salvageserver core AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${afssrvlibexecdir}/salvageserver: salvageserver
-	${INSTALL} -ns $? $@
-
-${DESTDIR}${afssrvsbindir}/fssync-debug: fssync-debug
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvsbindir}/salvsync-debug: salvsync-debug
-	${INSTALL} -s $? $@
-
-dest: ${DEST_TARGS}
--- a/src/tsm41/Makefile.in
+++ b/src/tsm41/Makefile.in
@ -97,13 +97,9 @@ aix_auth.o:
 aix_ident.o: ${srcdir}/aix41_ident.c
 	${CCRULE}

-${DEST}/root.client/usr/vice/etc/afs_dynamic_auth: afs_dynamic_auth
-	${INSTALL} $? $@
-
-${DEST}/root.client/usr/vice/etc/afs_dynamic_kerbauth: afs_dynamic_kerbauth
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/root.client/usr/vice/etc/afs_dynamic_auth \
-	${DEST}/root.client/usr/vice/etc/afs_dynamic_kerbauth
-
+dest: afs_dynamic_auth afs_dynamic_kerbauth
+	${INSTALL} -d ${DEST}/root.client/usr/vice/etc
+	${INSTALL_PROGRAM} afs_dynamic_auth \
+		${DEST}/root.client/usr/vice/etc/afs_dynamic_auth
+	${INSTALL_PROGRAM} afs_dynamic_kerbauth \
+		${DEST}/root.client/usr/vice/etc/afs_dynamic_kerbauth
--- a/src/tviced/Makefile.in
+++ b/src/tviced/Makefile.in
@ -205,24 +205,22 @@ fileserver: ${objects} ${LIBS}
 state_analyzer: ${SDBGOBJS}
 	${CC} ${LDFLAGS} -o state_analyzer ${SDBGOBJS} ${MT_LIBS} ${XLIBS}

-${DEST}/root.server/usr/afs/bin/fileserver: fileserver
-	${INSTALL} -ns $? $@
+install: fileserver state_analyzer
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL} -d ${DESTDIR}${afssrvsbindir}
+	${INSTALL_PROGRAM} fileserver \
+		${DESTDIR}${afssrvlibexecdir}/fileserver
+	${INSTALL_PROGRAM} state_analyzer \
+		${DESTDIR}${afssrvsbindir}/state_analyzer

-${DEST}/root.server/usr/afs/bin/state_analyzer: state_analyzer
-	${INSTALL} $? $@
-
-install: ${DESTDIR}${afssrvlibexecdir}/fileserver ${DESTDIR}${afssrvsbindir}/state_analyzer
+dest: fileserver state_analyzer
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_PROGRAM} fileserver \
+		${DEST}/root.server/usr/afs/bin/fileserver
+	${INSTALL_PROGRAM} state_analyzer \
+		${DEST}/root.server/usr/afs/bin/state_analyzer

 clean:
 	$(RM) -f *.o fileserver state_analyzer core AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${afssrvlibexecdir}/fileserver: fileserver
-	${INSTALL} -ns $? $@
-
-${DESTDIR}${afssrvsbindir}/state_analyzer: state_analyzer
-	${INSTALL} $? $@
-
-dest: ${DEST}/root.server/usr/afs/bin/fileserver ${DEST}/root.server/usr/afs/bin/state_analyzer
-
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@ -198,18 +198,15 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c
 volserver: ${objects} ${LIBS}
 	${CC} ${LDFLAGS} -o volserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}

-${DEST}/root.server/usr/afs/bin/volserver: volserver
-	${INSTALL} -ns $? $@
+install: volserver
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL_PROGRAM} volserver ${DESTDIR}${afssrvlibexecdir}/volserver

-install: ${DESTDIR}${afssrvlibexecdir}/volserver
+dest: volserver
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_PROGRAM} volserver ${DEST}/root.server/usr/afs/bin/volserver

 clean:
 	$(RM) -f *.o volserver core AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${afssrvlibexecdir}/volserver: volserver
-	${INSTALL} -ns $? $@
-
-dest: ${DEST}/root.server/usr/afs/bin/volserver
-
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@ -27,6 +27,15 @@ depinstall: \
 	${TOP_INCDIR}/ubik.h \
 	${TOP_INCDIR}/ubik_int.h

+${TOP_LIBDIR}/libubik.a: libubik.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/ubik.h: ubik.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/ubik_int.h: ubik_int.h
+	${INSTALL_DATA} $? $@
+
 utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a 
 	${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS)

@ -54,10 +63,10 @@ ubik_int.xdr.c: ubik_int.h

 Kubik_int.cs.c: ubik_int.xg Kubik_int.h
 	${RXGEN} -x -k -C -o Kubik_int.cs.c ${srcdir}/ubik_int.xg
- 
+
 Kubik_int.xdr.c: ubik_int.xg
 	${RXGEN} -x -k -c -o Kubik_int.xdr.c ${srcdir}/ubik_int.xg
- 
+
 Kubik_int.h: ubik_int.xg
 	${RXGEN} -x -k -h -o Kubik_int.h ${srcdir}/ubik_int.xg

@ -121,24 +130,26 @@ utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h
 #
 test: all

-install: \
-	${DESTDIR}${libdir}/libubik.a \
-	${DESTDIR}${includedir}/ubik.h \
-	${DESTDIR}${includedir}/ubik_int.h \
-	${DESTDIR}${bindir}/udebug \
-	${DESTDIR}${afssrvbindir}/udebug
+install: libubik.a ubik.h ubik_int.h udebug
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL} -d ${DESTDIR}${includedir}
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} -d ${DESTDIR}${afssrvbindir}
+	${INSTALL_DATA} libubik.a ${DESTDIR}${libdir}/libubik.a
+	${INSTALL_DATA} ubik.h ${DESTDIR}${includedir}/ubik.h
+	${INSTALL_DATA} ubik_int.h ${DESTDIR}${includedir}/ubik_int.h
+	${INSTALL_PROGRAM} udebug ${DESTDIR}${bindir}/udebug
+	${INSTALL_PROGRAM} udebug ${DESTDIR}${afssrvbindir}/udebug

-${DEST}/bin/udebug ${DEST}/root.server/usr/afs/bin/udebug: udebug
-	${INSTALL} $? $@
-
-${DEST}/lib/libubik.a: libubik.a
-	${INSTALL} $? $@
-
-${DEST}/include/ubik.h: ubik.h
-	${INSTALL} $? $@
-
-${DEST}/include/ubik_int.h: ubik_int.h
-	${INSTALL} $? $@
+dest: libubik.a ubik.h ubik_int.h udebug
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL} -d ${DEST}/include
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_DATA} libubik.a ${DEST}/lib/libubik.a
+	${INSTALL_DATA} ubik.h ${DEST}/include/ubik.h
+	${INSTALL_DATA} ubik_int.h ${DEST}/include/ubik_int.h
+	${INSTALL_PROGRAM} udebug ${DEST}/bin/udebug
+	${INSTALL_PROGRAM} udebug ${DEST}/root.server/usr/afs/bin/udebug

 #
 # Misc. targets
@ -148,36 +159,3 @@ clean:
 	$(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h

 include ../config/Makefile.version
-
-
-${DESTDIR}${libdir}/libubik.a: libubik.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libubik.a: libubik.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/ubik.h: ubik.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/ubik.h: ubik.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/ubik_int.h: ubik_int.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/ubik_int.h: ubik_int.h
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/udebug: udebug
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvbindir}/udebug: udebug
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/lib/libubik.a \
-	${DEST}/include/ubik.h \
-	${DEST}/include/ubik_int.h \
-	${DEST}/bin/udebug \
-	${DEST}/root.server/usr/afs/bin/udebug
-
--- a/src/update/Makefile.in
+++ b/src/update/Makefile.in
@ -51,13 +51,15 @@ update.er.c: update.h
 #
 # Installation targets
 #
-install : ${DESTDIR}${afssrvlibexecdir}/upserver ${DESTDIR}${afssrvlibexecdir}/upclient
+install: upserver upclient
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL_PROGRAM} upserver ${DESTDIR}${afssrvlibexecdir}/upserver
+	${INSTALL_PROGRAM} upclient ${DESTDIR}${afssrvlibexecdir}/upclient

-${DEST}/root.server/usr/afs/bin/upserver: upserver
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/upclient: upclient
-	${INSTALL} $? $@
+dest: upserver upclient
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_PROGRAM} upserver ${DEST}/root.server/usr/afs/bin/upserver
+	${INSTALL_PROGRAM} upclient ${DEST}/root.server/usr/afs/bin/upclient

 #
 # Misc. targets
@ -67,12 +69,3 @@ clean:
 	AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${afssrvlibexecdir}/upserver: upserver
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvlibexecdir}/upclient: upclient
-	${INSTALL} $? $@
-
-dest: ${DEST}/root.server/usr/afs/bin/upserver ${DEST}/root.server/usr/afs/bin/upclient
-
--- a/src/usd/Makefile.in
+++ b/src/usd/Makefile.in
@ -14,6 +14,12 @@ CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${A

 all: ${TOP_LIBDIR}/libusd.a ${TOP_INCDIR}/afs/usd.h

+${TOP_LIBDIR}/libusd.a: libusd.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/usd.h: usd.h
+	${INSTALL_DATA} $? $@
+
 #
 # Build targets
 #
@ -27,13 +33,17 @@ usd_file.o: usd_file.c usd.h
 #
 # Installation targets
 #
-install: ${DESTDIR}${libdir}/afs/libusd.a ${DESTDIR}${includedir}/afs/usd.h
+install: libusd.a usd.h
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} libusd.a ${DESTDIR}${libdir}/afs/libusd.a
+	${INSTALL_DATA} usd.h ${DESTDIR}${includedir}/afs/usd.h

-${DEST}/lib/afs/libusd.a: libusd.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/usd.h: usd.h
-	${INSTALL} $? $@
+dest: libusd.a usd.h
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} libusd.a ${DEST}/lib/afs/libusd.a
+	${INSTALL_DATA} usd.h ${DEST}/include/afs/usd.h

 #
 # Misc. targets
@ -42,17 +52,3 @@ clean:
 	$(RM) -f *.o libusd.a core AFS_component_version_number.c

 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/libusd.a: libusd.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libusd.a: libusd.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/usd.h: usd.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/usd.h: usd.h
-	${INSTALL} $? $@
-
-dest: ${DEST}/lib/afs/libusd.a ${DEST}/include/afs/usd.h
-
--- a/src/uss/Makefile.in
+++ b/src/uss/Makefile.in
@ -8,8 +8,6 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config

-
-
 all: uss

 CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config \
@ -103,10 +101,13 @@ y.tab.c : grammar.y
 #
 # Installation targets
 #
-install: ${DESTDIR}${sbindir}/uss
+install:
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL_PROGRAM} uss ${DESTDIR}${sbindir}/uss

-${DEST}/etc/uss: uss
-	${INSTALL} $? $@
+dest:
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL_PROGRAM} uss ${DEST}/etc/uss

 #
 # Misc. targets
@ -115,10 +116,3 @@ clean:
 	$(RM) -f *.o uss y.tab.c y.tab.h lex.yy.c core AFS_component_version_number.c

 include ../config/Makefile.version
-
-#
-${DESTDIR}${sbindir}/uss: uss
-	${INSTALL} $? $@
-
-dest: ${DEST}/etc/uss
-
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@ -42,6 +42,63 @@ all: ${includes} \

 depinstall: ${includes}

+${TOP_INCDIR}/afs/dirpath.h: dirpath.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/assert.h: ${srcdir}/assert.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/vice.h: ${srcdir}/vice.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/remote.h: ${srcdir}/remote.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/ktime.h: ${srcdir}/ktime.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/fileutil.h: ${srcdir}/fileutil.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/netutils.h: ${srcdir}/netutils.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/packages.h: ${srcdir}/packages.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/afsutil.h: ${srcdir}/afsutil.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/afsutil_prototypes.h: ${srcdir}/afsutil_prototypes.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/softsig.h: ${srcdir}/softsig.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/util.a: util.a
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libafsutil.a: util.a
+	${INSTALL_DATA} $? $@
+
 dirpath.h: ${srcdir}/dirpath.hin Makefile
 	( sed \
 		-e "s+@afsconfdir+${afsconfdir}+" \
@ -55,7 +112,8 @@ dirpath.h: ${srcdir}/dirpath.hin Makefile
 		-e "s+@afsbackupdir+${afsbackupdir}+" \
 		-e "s+@afsbosconfigdir+${afsbosconfigdir}+" \
 		${srcdir}/dirpath.hin >dirpath.h.tmp && \
-		mv dirpath.h.tmp dirpath.h )
+		if cmp dirpath.h.tmp dirpath.h >/dev/null ; then : ; else \
+		mv dirpath.h.tmp dirpath.h ; fi)

 util.a: ${objects} AFS_component_version_number.o
 	$(RM) -f util.a
@ -149,211 +207,55 @@ rxkstats.o: ${srcdir}/rxkstats.c ${includes}
 KDIR=../libafs/afs
 UKDIR=../libuafs/afs

-install: \
-	${DESTDIR}${includedir}/afs/dirpath.h \
-	${DESTDIR}${includedir}/afs/pthread_nosigs.h \
-	${DESTDIR}${includedir}/afs/assert.h \
-	${DESTDIR}${includedir}/afs/errors.h \
-	${DESTDIR}${includedir}/afs/vice.h \
-	${DESTDIR}${includedir}/afs/remote.h \
-	${DESTDIR}${includedir}/afs/ktime.h \
-	${DESTDIR}${includedir}/afs/fileutil.h \
-	${DESTDIR}${includedir}/afs/netutils.h \
-	${DESTDIR}${includedir}/afs/packages.h \
-	${DESTDIR}${includedir}/afs/afsutil.h \
-	${DESTDIR}${includedir}/afs/afsutil_prototypes.h \
-	${DESTDIR}${includedir}/afs/pthread_glock.h \
-	${DESTDIR}${includedir}/afs/afs_atomlist.h \
-	${DESTDIR}${includedir}/afs/afs_lhash.h \
-	${DESTDIR}${includedir}/afs/softsig.h \
-	${DESTDIR}${includedir}/potpourri.h \
-	${DESTDIR}${libdir}/afs/util.a \
-	${DESTDIR}${libdir}/afs/libafsutil.a \
-	${DESTDIR}${bindir}/sys
-
-${TOP_INCDIR}/afs/dirpath.h: dirpath.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/assert.h: ${srcdir}/assert.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/vice.h: ${srcdir}/vice.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/remote.h: ${srcdir}/remote.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ktime.h: ${srcdir}/ktime.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/fileutil.h: ${srcdir}/fileutil.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/netutils.h: ${srcdir}/netutils.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/packages.h: ${srcdir}/packages.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/afsutil.h: ${srcdir}/afsutil.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/afsutil_prototypes.h: ${srcdir}/afsutil_prototypes.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/softsig.h: ${srcdir}/softsig.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
-	${INSTALL} $? $@
-
-
-${TOP_LIBDIR}/util.a: util.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libafsutil.a: util.a
-	${INSTALL} $? $@
-
-
-${DESTDIR}${includedir}/afs/dirpath.h: dirpath.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/assert.h: ${srcdir}/assert.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/errors.h: ${srcdir}/errors.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/vice.h: ${srcdir}/vice.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/remote.h: ${srcdir}/remote.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ktime.h: ${srcdir}/ktime.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/fileutil.h: ${srcdir}/fileutil.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/netutils.h: ${srcdir}/netutils.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/packages.h: ${srcdir}/packages.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afsutil.h: ${srcdir}/afsutil.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afsutil_prototypes.h: ${srcdir}/afsutil_prototypes.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/softsig.h: ${srcdir}/softsig.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/potpourri.h: ${srcdir}/potpourri.h
-	${INSTALL} $? $@
-
-
-${DESTDIR}${libdir}/afs/util.a: util.a
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libafsutil.a: util.a
-	${INSTALL} $? $@
-
-
-${DESTDIR}${bindir}/sys: sys
-	${INSTALL} $? $@
-
-
-${DEST}/include/afs/dirpath.h: dirpath.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/assert.h: ${srcdir}/assert.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/errors.h: ${srcdir}/errors.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/vice.h: ${srcdir}/vice.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/remote.h: ${srcdir}/remote.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/ktime.h: ${srcdir}/ktime.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/fileutil.h: ${srcdir}/fileutil.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/netutils.h: ${srcdir}/netutils.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/packages.h: ${srcdir}/packages.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afsutil.h: ${srcdir}/afsutil.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afsutil_prototypes.h: ${srcdir}/afsutil_prototypes.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/pthread_glock.h: ${srcdir}/pthread_glock.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs_atomlist.h: ${srcdir}/afs_atomlist.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/afs_lhash.h: ${srcdir}/afs_lhash.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/softsig.h: ${srcdir}/softsig.h
-	${INSTALL} $? $@
-
-${DEST}/include/potpourri.h: ${srcdir}/potpourri.h
-	${INSTALL} $? $@
-
-
-${DEST}/lib/afs/util.a: util.a
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libafsutil.a: util.a
-	${INSTALL} $? $@
-
-
-${DEST}/bin/sys: sys
-	${INSTALL} $? $@
+install: dirpath.h util.a sys
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL_DATA} dirpath.h ${DESTDIR}${includedir}/afs/dirpath.h
+	${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DESTDIR}${includedir}/afs/pthread_nosigs.h
+	${INSTALL_DATA} ${srcdir}/assert.h ${DESTDIR}${includedir}/afs/assert.h
+	${INSTALL_DATA} ${srcdir}/errors.h ${DESTDIR}${includedir}/afs/errors.h
+	${INSTALL_DATA} ${srcdir}/vice.h ${DESTDIR}${includedir}/afs/vice.h
+	${INSTALL_DATA} ${srcdir}/remote.h ${DESTDIR}${includedir}/afs/remote.h
+	${INSTALL_DATA} ${srcdir}/ktime.h ${DESTDIR}${includedir}/afs/ktime.h
+	${INSTALL_DATA} ${srcdir}/fileutil.h ${DESTDIR}${includedir}/afs/fileutil.h
+	${INSTALL_DATA} ${srcdir}/netutils.h ${DESTDIR}${includedir}/afs/netutils.h
+	${INSTALL_DATA} ${srcdir}/packages.h ${DESTDIR}${includedir}/afs/packages.h
+	${INSTALL_DATA} ${srcdir}/afsutil.h ${DESTDIR}${includedir}/afs/afsutil.h
+	${INSTALL_DATA} ${srcdir}/afsutil_prototypes.h ${DESTDIR}${includedir}/afs/afsutil_prototypes.h
+	${INSTALL_DATA} ${srcdir}/pthread_glock.h ${DESTDIR}${includedir}/afs/pthread_glock.h
+	${INSTALL_DATA} ${srcdir}/afs_atomlist.h ${DESTDIR}${includedir}/afs/afs_atomlist.h
+	${INSTALL_DATA} ${srcdir}/afs_lhash.h ${DESTDIR}${includedir}/afs/afs_lhash.h
+	${INSTALL_DATA} ${srcdir}/softsig.h ${DESTDIR}${includedir}/afs/softsig.h
+	${INSTALL_DATA} ${srcdir}/potpourri.h ${DESTDIR}${includedir}/potpourri.h
+	${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/util.a
+	${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/libafsutil.a
+	${INSTALL_PROGRAM} sys ${DESTDIR}${bindir}/sys
+
+dest: dirpath.h util.a sys
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL_DATA} dirpath.h ${DEST}/include/afs/dirpath.h
+	${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DEST}/include/afs/pthread_nosigs.h
+	${INSTALL_DATA} ${srcdir}/assert.h ${DEST}/include/afs/assert.h
+	${INSTALL_DATA} ${srcdir}/errors.h ${DEST}/include/afs/errors.h
+	${INSTALL_DATA} ${srcdir}/vice.h ${DEST}/include/afs/vice.h
+	${INSTALL_DATA} ${srcdir}/remote.h ${DEST}/include/afs/remote.h
+	${INSTALL_DATA} ${srcdir}/ktime.h ${DEST}/include/afs/ktime.h
+	${INSTALL_DATA} ${srcdir}/fileutil.h ${DEST}/include/afs/fileutil.h
+	${INSTALL_DATA} ${srcdir}/netutils.h ${DEST}/include/afs/netutils.h
+	${INSTALL_DATA} ${srcdir}/packages.h ${DEST}/include/afs/packages.h
+	${INSTALL_DATA} ${srcdir}/afsutil.h ${DEST}/include/afs/afsutil.h
+	${INSTALL_DATA} ${srcdir}/afsutil_prototypes.h ${DEST}/include/afs/afsutil_prototypes.h
+	${INSTALL_DATA} ${srcdir}/pthread_glock.h ${DEST}/include/afs/pthread_glock.h
+	${INSTALL_DATA} ${srcdir}/afs_atomlist.h ${DEST}/include/afs/afs_atomlist.h
+	${INSTALL_DATA} ${srcdir}/afs_lhash.h ${DEST}/include/afs/afs_lhash.h
+	${INSTALL_DATA} ${srcdir}/softsig.h ${DEST}/include/afs/softsig.h
+	${INSTALL_DATA} ${srcdir}/potpourri.h ${DEST}/include/potpourri.h
+	${INSTALL_DATA} util.a ${DEST}/lib/afs/util.a
+	${INSTALL_DATA} util.a ${DEST}/lib/afs/libafsutil.a
+	${INSTALL_PROGRAM} sys ${DEST}/bin/sys

 #
 # Misc targets
@ -368,28 +270,6 @@ test:

 include ../config/Makefile.version

-dest: \
-	${DEST}/include/afs/dirpath.h \
-	${DEST}/include/afs/pthread_nosigs.h \
-	${DEST}/include/afs/assert.h \
-	${DEST}/include/afs/errors.h \
-	${DEST}/include/afs/vice.h \
-	${DEST}/include/afs/remote.h \
-	${DEST}/include/afs/ktime.h \
-	${DEST}/include/afs/fileutil.h \
-	${DEST}/include/afs/netutils.h \
-	${DEST}/include/afs/packages.h \
-	${DEST}/include/afs/afsutil.h \
-	${DEST}/include/afs/afsutil_prototypes.h \
-	${DEST}/include/afs/pthread_glock.h \
-	${DEST}/include/afs/afs_atomlist.h \
-	${DEST}/include/afs/afs_lhash.h \
-	${DEST}/include/afs/softsig.h \
-	${DEST}/include/potpourri.h \
-	${DEST}/lib/afs/util.a \
-	${DEST}/lib/afs/libafsutil.a \
-	${DEST}/bin/sys
-
 check-splint:
 	sh $(HELPER_SPLINT) $(CFLAGS) \
 	    assert.c base64.c casestrcpy.c ktime.c volparse.c hostparse.c \
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@ -51,24 +51,6 @@ cacheout: cacheout.o

 cacheout.o: cacheout.c

-${DEST}/bin/fs ${DEST}/root.server/usr/afs/bin/fs: fs
-	${INSTALL} -s $? $@
-
-${DEST}/bin/livesys: livesys
-	${INSTALL} -s $? $@
-
-${DEST}/bin/up: up
-	${INSTALL} -s $? $@
-
-${DEST}/etc/fstrace: fstrace
-	${INSTALL} -s $? $@
-
-${DEST}/bin/cmdebug: cmdebug
-	${INSTALL} -s $? $@
-
-${DEST}/bin/dedebug: dedebug
-	${INSTALL} -s $? $@
-

 up.o: up.c AFS_component_version_number.c

@ -272,56 +254,85 @@ kdump-alpha_linux-@LINUX_VERSION@: kdump-alpha_linux-@LINUX_VERSION@.o
 		${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS}

 #
-# kdump install targets
+# Install targets
 #
-${DEST}/etc/kdump: kdump-build
+install: kdump-build fs livesys up fstrace cmdebug
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} -d ${DESTDIR}${afssrvbindir}
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL_PROGRAM} fs ${DESTDIR}${bindir}/fs
+	${INSTALL_PROGRAM} livesys ${DESTDIR}${bindir}/livesys
+	${INSTALL_PROGRAM} fs ${DESTDIR}${afssrvbindir}/fs
+	${INSTALL_PROGRAM} up ${DESTDIR}${bindir}/up
+	${INSTALL_PROGRAM} fstrace ${DESTDIR}${sbindir}/fstrace
+	${INSTALL_PROGRAM} cmdebug ${DESTDIR}${bindir}/cmdebug
 	-set -x; \
 	case ${SYS_NAME} in \
 	sgi_6? ) \
-		${INSTALLex} -f ${srcdir}/kdump.sh.sgi_ipnos ${DEST}/etc/kdump; \
+		${INSTALL_SCRIPT} kdump.sh.sgi_ipnos ${DESTDIR}${sbindir}/kdump; \
+		ln -fs kdump ${DESTDIR}${sbindir}/kdump32; \
+		ln -fs kdump.IP20 ${DESTDIR}${sbindir}/kdump.IP22; \
+		ln -fs kdump.IP20 ${DESTDIR}${sbindir}/kdump.IP32; \
+		for f in kdump.IP??; \
+			do ${INSTALL_PROGRAM} $$f ${DESTDIR}${sbindir}/$$f || exit $$? ; \
+		done ;; \
+	sun*_5[789] | sun*_510 ) \
+		${INSTALL_SCRIPT} kdump.sh.solaris7 ${DESTDIR}${sbindir}/kdump32; \
+		${INSTALL_PROGRAM} kdump-build ${DESTDIR}${sbindir}/kdump;; \
+	*linux* ) \
+		${INSTALL_SCRIPT} kdump.sh.linux ${DESTDIR}${sbindir}/kdump; \
+		${INSTALL_PROGRAM} kdump-build ${DESTDIR}${sbindir}/kdump ;; \
+	hp_ux11* ) \
+		${INSTALL_SCRIPT} kdump.sh.hp_ux11 ${DESTDIR}${sbindir}/kdump; \
+		${INSTALL_PROGRAM} kdump-build ${DESTDIR}${sbindir}/kdump ;; \
+	*) \
+		${INSTALL_PROGRAM} kdump-build ${DESTDIR}${sbindir}/kdump ;; \
+	esac
+	if [ -f kdump64 ]; then \
+		${INSTALL_PROGRAM} kdump64 ${DESTDIR}${sbindir}/kdump; \
+	fi
+
+dest: kdump-build fs livesys up fstrace cmdebug
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_PROGRAM} fs ${DEST}/bin/fs
+	${INSTALL_PROGRAM} livesys ${DEST}/bin/livesys
+	${INSTALL_PROGRAM} fs ${DEST}/root.server/usr/afs/bin/fs
+	${INSTALL_PROGRAM} up ${DEST}/bin/up
+	${INSTALL_PROGRAM} fstrace ${DEST}/etc/fstrace
+	${INSTALL_PROGRAM} cmdebug ${DEST}/bin/cmdebug
+	-set -x; \
+	case ${SYS_NAME} in \
+	sgi_6? ) \
+		${INSTALL_SCRIPT} ${srcdir}/kdump.sh.sgi_ipnos ${DEST}/etc/kdump; \
 		ln -fs kdump ${DEST}/etc/kdump32; \
 		ln -fs kdump.IP20 ${DEST}/etc/kdump.IP22; \
 		ln -fs kdump.IP20 ${DEST}/etc/kdump.IP32; \
 		for f in kdump.IP??; \
-			do ${INSTALL} -s $$f ${DEST}/etc/$$f || exit $$? ; \
+			do ${INSTALL_PROGRAM} $$f ${DEST}/etc/$$f || exit $$? ; \
 		done ;; \
 	sun*_5[789] | sun*_510 ) \
-		${INSTALLex} -f ${srcdir}/kdump.sh.solaris7 ${DEST}/etc/kdump; \
-		${INSTALL} -s -f ${srcdir}/kdump ${DEST}/etc/kdump32;; \
+		${INSTALL_SCRIPT} ${srcdir}/kdump.sh.solaris7 ${DEST}/etc/kdump; \
+		${INSTALL_PROGRAM} ${srcdir}/kdump ${DEST}/etc/kdump32;; \
 	*alpha_linux* ) \
-		${INSTALLex} -f ${srcdir}/kdump.sh.linux ${DEST}/etc/kdump; \
-		${INSTALL} -s kdump-alpha_linux-${LINUX_VERSION} $@ ;; \
+		${INSTALL_SCRIPT} ${srcdir}/kdump.sh.linux ${DEST}/etc/kdump; \
+		${INSTALL_PROGRAM} kdump-alpha_linux-${LINUX_VERSION} ${DEST}/etc/kdump ;; \
 	*linux* ) \
-		${INSTALLex} -f ${srcdir}/kdump.sh.linux ${DEST}/etc/kdump; \
-		${INSTALL} -s kdump-linux-${LINUX_VERSION} $@-${LINUX_VERSION} ;; \
+		${INSTALL_SCRIPT} ${srcdir}/kdump.sh.linux ${DEST}/etc/kdump; \
+		${INSTALL_PROGRAM} kdump-linux-${LINUX_VERSION} ${DEST}/etc/kdump-${LINUX_VERSION} ;; \
 	hp_ux11* ) \
-		${INSTALLex} -f ${srcdir}/kdump.sh.hp_ux11 ${DEST}/etc/kdump; \
-		${INSTALL} -s -f $? $@;; \
+		${INSTALL_SCRIPT} ${srcdir}/kdump.sh.hp_ux11 ${DEST}/etc/kdump; \
+		${INSTALL_PROGRAM} kdump-build ${DEST}/etc/kdump ;; \
 	*nbsd*) \
 		;; \
 	*) \
-		${INSTALL} -s $? $@ ;; \
+		${INSTALL_PROGRAM} kdump-build ${DEST}/etc/kdump ;; \
 	esac
-
-${DEST}/etc/kdump64: kdump-build
 	if [ -f kdump64 ]; then \
-		${INSTALL} -s kdump64 $@; \
+		${INSTALL_PROGRAM} kdump64 ${DEST}/etc/kdump; \
 	fi

-
-#
-# Install targets
-#
-install: \
-	${DESTDIR}${bindir}/fs \
-	${DESTDIR}${bindir}/livesys \
-	${DESTDIR}${afssrvbindir}/fs \
-	${DESTDIR}${bindir}/up \
-	${DESTDIR}${sbindir}/fstrace \
-	${DESTDIR}${bindir}/cmdebug \
-	${DESTDIR}${sbindir}/kdump \
-	${DESTDIR}${sbindir}/kdump64
-
 #
 # Misc targets
 #
@ -333,64 +344,3 @@ test:
 	cd test; $(MAKE)

 include ../config/Makefile.version
-
-${DESTDIR}${bindir}/fs: fs
-	${INSTALL} -s $? $@
-
-${DESTDIR}${bindir}/livesys: livesys
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvbindir}/fs: fs
-	${INSTALL} -s $? $@
-
-${DESTDIR}${bindir}/up: up
-	${INSTALL} -s $? $@
-
-${DESTDIR}${sbindir}/fstrace: fstrace
-	${INSTALL} -s $? $@
-
-${DESTDIR}${bindir}/cmdebug: cmdebug
-	${INSTALL} -s $? $@
-
-${DESTDIR}${bindir}/dedebug: dedebug
-	${INSTALL} -s $? $@
-
-${DESTDIR}${sbindir}/kdump: kdump-build
-	-set -x; \
-	case ${SYS_NAME} in \
-	sgi_6? ) \
-		${INSTALLex} -f kdump.sh.sgi_ipnos ${DESTDIR}${sbindir}/kdump; \
-		ln -fs kdump ${DESTDIR}${sbindir}/kdump32; \
-		ln -fs kdump.IP20 ${DESTDIR}${sbindir}/kdump.IP22; \
-		ln -fs kdump.IP20 ${DESTDIR}${sbindir}/kdump.IP32; \
-		for f in kdump.IP??; \
-			do ${INSTALL} -s $$f ${DESTDIR}${sbindir}/$$f || exit $$? ; \
-		done ;; \
-	sun*_5[789] | sun*_510 ) \
-		${INSTALLex} -f kdump.sh.solaris7 ${DESTDIR}${sbindir}/kdump32; \
-		${INSTALL} -s -f $? $@;; \
-	*linux* ) \
-		${INSTALLex} -f kdump.sh.linux ${DESTDIR}${sbindir}/kdump; \
-		${INSTALL} -s $? $@ ;; \
-	hp_ux11* ) \
-		${INSTALLex} -f kdump.sh.hp_ux11 ${DESTDIR}${sbindir}/kdump; \
-		${INSTALL} -s -f $? $@;; \
-	*) \
-		${INSTALL} -s $? $@ ;; \
-	esac
-
-${DESTDIR}${sbindir}/kdump64: kdump-build
-	if [ -f kdump64 ]; then \
-		${INSTALL} -s kdump64 $@; \
-	fi
-
-dest: \
-	${DEST}/bin/fs \
-	${DEST}/bin/livesys \
-	${DEST}/root.server/usr/afs/bin/fs \
-	${DEST}/bin/up \
-	${DEST}/etc/fstrace \
-	${DEST}/bin/cmdebug \
-	${DEST}/etc/kdump \
-	${DEST}/etc/kdump64
-
--- a/src/vfsck/Makefile.in
+++ b/src/vfsck/Makefile.in
@ -40,18 +40,15 @@ main.o: main.c AFS_component_version_number.c
 #
 # Installation targets
 #
-install: ${DESTDIR}${afssrvlibexecdir}/vfsck
+install: vfsck
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL_PROGRAM} vfsck ${DESTDIR}${afssrvlibexecdir}/vfsck

-${DEST}/root.server/etc/vfsck: vfsck
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/vfsck: vfsck
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvlibexecdir}/vfsck: vfsck
-	${INSTALL} $? $@
-
-dest: ${DEST}/root.server/etc/vfsck ${DEST}/root.server/usr/afs/bin/vfsck
+dest: vfsck
+	${INSTALL} -d ${DEST}/root.server/etc
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_PROGRAM} vfsck ${DEST}/root.server/etc/vfsck
+	${INSTALL_PROGRAM} vfsck ${DEST}/root.server/usr/afs/bin/vfsck
 	case ${SYS_NAME} in \
 		hp_ux10?) \
 			${CP} ${srcdir}/bcheckrc ${DEST}/root.server/etc ;; \
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@ -61,6 +61,9 @@ objects=viced.o		\

 all: cbd fsprobe check_sysid fileserver ${TOP_INCDIR}/afs/fs_stats.h

+${TOP_INCDIR}/afs/fs_stats.h: fs_stats.h
+	${INSTALL_DATA} $? $@
+
 ${objects}: ${headers}

 viced.o: AFS_component_version_number.o
@ -91,51 +94,44 @@ cbd.o: callback.c AFS_component_version_number.c
 cbd: cbd.o
 	${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS} 

-${DEST}/root.server/usr/afs/bin/fileserver: fileserver
+install: fileserver fs_stats.h
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} fs_stats.h ${DESTDIR}${includedir}/afs/fs_stats.h
 	@case ${SYS_NAME} in \
 	alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
-	echo "Don't install fileserver for ${SYS_NAME}" ;; \
+		echo "Don't install fileserver for ${SYS_NAME}" ;; \
 	*_darwin_[1-6][0-9]) \
-	echo ${INSTALL} -ns $? $@ ; \
-	${INSTALL} -ns $? $@ ;; \
+		echo ${INSTALL_PROGRAM} fileserver ${DESTDIR}${afssrvlibexecdir}/fileserver ; \
+		${INSTALL_PROGRAM} fileserver ${DESTDIR}${afssrvlibexecdir}/fileserver ;; \
 	*_darwin_*) \
-	echo "Don't install fileserver for ${SYS_NAME}" ;; \
+		echo "Don't install fileserver for ${SYS_NAME}" ;; \
 	*) \
-	echo ${INSTALL} -ns $? $@ ; \
-	${INSTALL} -ns $? $@ ;; \
+		echo ${INSTALL_PROGRAM} fileserver ${DESTDIR}${afssrvlibexecdir}/fileserver ; \
+		${INSTALL_PROGRAM} fileserver ${DESTDIR}${afssrvlibexecdir}/fileserver ;; \
 	esac

-${DEST}/include/afs/fs_stats.h: fs_stats.h
-	${INSTALL} $? $@
-
-install:    ${DESTDIR}${afssrvlibexecdir}/fileserver ${DESTDIR}${includedir}/afs/fs_stats.h
+dest: fileserver fs_stats.h
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} fs_stats.h ${DEST}/include/afs/fs_stats.h
+	@case ${SYS_NAME} in \
+	alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
+		echo "Don't install fileserver for ${SYS_NAME}" ;; \
+	*_darwin_[1-6][0-9]) \
+		echo ${INSTALL_PROGRAM} fileserver ${DEST}/root.server/usr/afs/bin/fileserver ; \
+		${INSTALL_PROGRAM} fileserver ${DEST}/root.server/usr/afs/bin/fileserver ;; \
+	*_darwin_*) \
+		echo "Don't install fileserver for ${SYS_NAME}" ;; \
+	*) \
+		echo ${INSTALL_PROGRAM} fileserver ${DEST}/root.server/usr/afs/bin/fileserver ; \
+		${INSTALL_PROGRAM} fileserver ${DEST}/root.server/usr/afs/bin/fileserver ;; \
+	esac

 clean:
 	$(RM) -f *.o fileserver core AFS_component_version_number.c cbd check_sysid fsprobe

 include ../config/Makefile.version
-${DESTDIR}${afssrvlibexecdir}/fileserver: fileserver
-	@case ${SYS_NAME} in \
-	alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
-	echo "Don't install fileserver for ${SYS_NAME}" ;; \
-	*_darwin_[1-6][0-9]) \
-	echo ${INSTALL} -ns $? $@ ; \
-	${INSTALL} -ns $? $@ ;; \
-	*_darwin_*) \
-	echo "Don't install fileserver for ${SYS_NAME}" ;; \
-	*) \
-	echo ${INSTALL} -ns $? $@ ; \
-	${INSTALL} -ns $? $@ ;; \
-	esac
-
-${DESTDIR}${includedir}/afs/fs_stats.h: fs_stats.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/fs_stats.h: fs_stats.h
-	${INSTALL} $? $@
-
-dest:    ${DEST}/root.server/usr/afs/bin/fileserver ${DEST}/include/afs/fs_stats.h
-
 check-splint::
 	sh $(HELPER_SPLINT) $(CFLAGS) \
 	    viced.c		\
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@ -45,6 +45,21 @@ depinstall: \
 	${TOP_INCDIR}/afs/vldbint.h \
 	${TOP_INCDIR}/afs/cnvldb.h 

+${TOP_LIBDIR}/libvldb.a: libvldb.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/vl_opcodes.h: vl_opcodes.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/vlserver.h: vlserver.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/vldbint.h: vldbint.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h
+	${INSTALL_DATA} $? $@
+
 vldb_check: vldb_check.o ${LIBS}
 	$(CC) ${CFLAGS} -o vldb_check vldb_check.o ${LIBS} ${XLIBS} 

@ -109,88 +124,35 @@ vlserver.h vl_errors.c: vl_errors.et vlserver.p.h

 system: install

-${DEST}/root.server/usr/afs/bin/vlserver: vlserver
-	${INSTALL} $? $@
+install: vlserver cnvldb vldb_check libvldb.a vl_opcodes.h vlserver.h \
+		vldbint.h cnvldb.h
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL} -d ${DESTDIR}${afssrvsbindir}
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_PROGRAM} vlserver ${DESTDIR}${afssrvlibexecdir}/vlserver
+	${INSTALL_PROGRAM} cnvldb ${DESTDIR}${afssrvsbindir}/vldb_convert
+	${INSTALL_PROGRAM} vldb_check ${DESTDIR}${afssrvsbindir}/vldb_check
+	${INSTALL_DATA} libvldb.a ${DESTDIR}${libdir}/afs/libvldb.a
+	${INSTALL_DATA} vl_opcodes.h ${DESTDIR}${includedir}/afs/vl_opcodes.h
+	${INSTALL_DATA} vlserver.h ${DESTDIR}${includedir}/afs/vlserver.h
+	${INSTALL_DATA} vldbint.h ${DESTDIR}${includedir}/afs/vldbint.h
+	${INSTALL_DATA} cnvldb.h ${DESTDIR}${includedir}/afs/cnvldb.h

-${DEST}/etc/vldb_convert: cnvldb
-	${INSTALL} -f $? $@
-
-${TOP_LIBDIR}/libvldb.a: libvldb.a
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/vl_opcodes.h: vl_opcodes.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/vlserver.h: vlserver.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/vldbint.h: vldbint.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h
-	${INSTALL} $? $@
-
-install: \
-	${DESTDIR}${afssrvlibexecdir}/vlserver \
-	${DESTDIR}${afssrvsbindir}/vldb_convert \
-	${DESTDIR}${libdir}/afs/libvldb.a \
-	${DESTDIR}${includedir}/afs/vl_opcodes.h \
-	${DESTDIR}${includedir}/afs/vlserver.h \
-	${DESTDIR}${includedir}/afs/vldbint.h \
-	${DESTDIR}${includedir}/afs/cnvldb.h \
-	${DESTDIR}${afssrvsbindir}/vldb_check
-
-${DESTDIR}${afssrvlibexecdir}/vlserver: vlserver
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/vldb_convert: cnvldb
-	${INSTALL} -f $? $@
-
-${DESTDIR}${libdir}/afs/libvldb.a: libvldb.a
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/vl_opcodes.h: vl_opcodes.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/vlserver.h: vlserver.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/vldbint.h: vldbint.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/cnvldb.h: cnvldb.h
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/vldb_check: vldb_check
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/root.server/usr/afs/bin/vlserver \
-	${DEST}/etc/vldb_convert \
-	${DEST}/lib/afs/libvldb.a \
-	${DEST}/include/afs/vl_opcodes.h \
-	${DEST}/include/afs/vlserver.h \
-	${DEST}/include/afs/vldbint.h \
-	${DEST}/include/afs/cnvldb.h \
-	${DEST}/etc/vldb_check
-
-${DEST}/lib/afs/libvldb.a: libvldb.a
-	${INSTALL} $? $@
-
-${DEST}/include/afs/vl_opcodes.h: vl_opcodes.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/vlserver.h: vlserver.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/vldbint.h: vldbint.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/cnvldb.h: cnvldb.h
-	${INSTALL} $? $@
-
-${DEST}/etc/vldb_check: vldb_check
-	${INSTALL} $? $@
+dest: vlserver cnvldb vldb_check libvldb.a vl_opcodes.h vlserver.h \
+		vldbint.h cnvldb.h
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_PROGRAM} vlserver ${DEST}/root.server/usr/afs/bin/vlserver
+	${INSTALL_PROGRAM} cnvldb ${DEST}/etc/vldb_convert
+	${INSTALL_PROGRAM} vldb_check ${DEST}/etc/vldb_check
+	${INSTALL_DATA} libvldb.a ${DEST}/lib/afs/libvldb.a
+	${INSTALL_DATA} vl_opcodes.h ${DEST}/include/afs/vl_opcodes.h
+	${INSTALL_DATA} vlserver.h ${DEST}/include/afs/vlserver.h
+	${INSTALL_DATA} vldbint.h ${DEST}/include/afs/vldbint.h
+	${INSTALL_DATA} cnvldb.h ${DEST}/include/afs/cnvldb.h

 #
 # Misc targets
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@ -33,7 +33,6 @@ all: gi \
 	salvager \
 	volinfo \
 	fssync-debug \
-	$(FS_CONV_OSF40D) \
 	$(XFS_SIZE_CHECK) \
 	$(FS_CONV_SOL26) \
 	${TOP_INCDIR}/afs/nfs.h \
@ -48,97 +47,118 @@ all: gi \
 	${TOP_INCDIR}/afs/ihandle.h \
 	${TOP_INCDIR}/afs/namei_ops.h

+${TOP_LIBDIR}/vlib.a: vlib.a
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libvlib.a: vlib.a
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/nfs.h: nfs.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/vnode.h: vnode.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/viceinode.h: viceinode.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/volume.h: volume.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/voldefs.h: voldefs.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/partition.h: partition.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/fssync.h: fssync.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/salvsync.h: salvsync.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/daemon_com.h: daemon_com.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/ihandle.h: ihandle.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/namei_ops.h: namei_ops.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/salvage.h: salvage.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/vol-salvage.h: vol-salvage.h
+	${INSTALL_DATA} $? $@
+
 #
 # Installation targets
 #
-install: \
-	${DESTDIR}${libdir}/afs/vlib.a \
-	${DESTDIR}${libdir}/afs/libvlib.a \
-	${DESTDIR}${afssrvlibexecdir}/salvager \
-	${DESTDIR}${afssrvsbindir}/volinfo \
-	${DESTDIR}${afssrvsbindir}/fssync-debug \
-	$(install_FS_CONV_OSF40D) \
-	$(install_XFS_SIZE_CHECK) \
-	$(install_FS_CONV_SOL26) \
-	${DESTDIR}${includedir}/afs/nfs.h \
-	${DESTDIR}${includedir}/afs/vnode.h \
-	${DESTDIR}${includedir}/afs/viceinode.h \
-	${DESTDIR}${includedir}/afs/volume.h \
-	${DESTDIR}${includedir}/afs/voldefs.h \
-	${DESTDIR}${includedir}/afs/partition.h \
-	${DESTDIR}${includedir}/afs/fssync.h \
-	${DESTDIR}${includedir}/afs/salvsync.h \
-	${DESTDIR}${includedir}/afs/daemon_com.h \
-	${DESTDIR}${includedir}/afs/ihandle.h \
-	${DESTDIR}${includedir}/afs/namei_ops.h
-
-${DEST}/root.server/usr/afs/bin/salvager: salvager 
-	${INSTALL} -s $? $@
-
-${DEST}/root.server/usr/afs/bin/volinfo: volinfo
-	${INSTALL} -s $? $@
-
-${DEST}/root.server/usr/afs/bin/fssync-debug: fssync-debug
-	if test "@DEMAND_ATTACH@" = "no"; then \
-		${INSTALL} -s $? $@ ; \
+install: vlib.a salvager volinfo fssync-debug
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL} -d ${DESTDIR}${afssrvsbindir}
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL_DATA} vlib.a ${DESTDIR}${libdir}/afs/vlib.a
+	${INSTALL_DATA} vlib.a ${DESTDIR}${libdir}/afs/libvlib.a
+	${INSTALL_PROGRAM} salvager ${DESTDIR}${afssrvlibexecdir}/salvager
+	${INSTALL_PROGRAM} volinfo ${DESTDIR}${afssrvsbindir}/volinfo
+	${INSTALL_DATA} nfs.h ${DESTDIR}${includedir}/afs/nfs.h
+	${INSTALL_DATA} vnode.h ${DESTDIR}${includedir}/afs/vnode.h
+	${INSTALL_DATA} viceinode.h ${DESTDIR}${includedir}/afs/viceinode.h
+	${INSTALL_DATA} volume.h ${DESTDIR}${includedir}/afs/volume.h
+	${INSTALL_DATA} voldefs.h ${DESTDIR}${includedir}/afs/voldefs.h
+	${INSTALL_DATA} partition.h ${DESTDIR}${includedir}/afs/partition.h
+	${INSTALL_DATA} fssync.h ${DESTDIR}${includedir}/afs/fssync.h
+	${INSTALL_DATA} salvsync.h ${DESTDIR}${includedir}/afs/salvsync.h
+	${INSTALL_DATA} daemon_com.h ${DESTDIR}${includedir}/afs/daemon_com.h
+	${INSTALL_DATA} ihandle.h ${DESTDIR}${includedir}/afs/ihandle.h
+	${INSTALL_DATA} namei_ops.h ${DESTDIR}${includedir}/afs/namei_ops.h
+	set -x; if test "@DEMAND_ATTACH@" = "no" ; then \
+		${INSTALL_PROGRAM} fssync-debug \
+			${DESTDIR}${afssrvsbindir}/fssync-debug ; \
+	fi
+	set -x; if test x"$(install_XFS_SIZE_CHECK)" != x"" ; then \
+		${INSTALL_PROGRAM} xfs_size_check \
+			${DESTDIR}${afssrvsbindir}/xfs_size_check ; \
+	fi
+	set -x; if test x"$(install_FS_CONV_SOL26)" != x"" ; then \
+		${INSTALL_PROGRAM} fs_conv_sol26 \
+			${DESTDIR}${afssrvsbindir}/fs_conv_sol26 ; \
 	fi

-${DEST}/lib/afs/vlib.a: vlib.a
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libvlib.a: vlib.a
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/fs_conv_dux40D:  fs_conv_dux40D
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvsbindir}/xfs_size_check:  xfs_size_check
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvsbindir}/fs_conv_sol26:  fs_conv_sol26
-	${INSTALL} -s $? $@
-
-$(DEST)/root.server/usr/afs/bin/fs_conv_dux40D:  fs_conv_dux40D
-	${INSTALL} -s $? $@
-
-$(DEST)/root.server/usr/afs/bin/xfs_size_check:  xfs_size_check
-	${INSTALL} -s $? $@
-
-$(DEST)/root.server/usr/afs/bin/fs_conv_sol26:  fs_conv_sol26
-	${INSTALL} -s $? $@
-
-${DEST}/include/afs/nfs.h: nfs.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/vnode.h: vnode.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/viceinode.h: viceinode.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/volume.h: volume.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/voldefs.h: voldefs.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/partition.h: partition.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/fssync.h: fssync.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/salvsync.h: salvsync.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/daemon_com.h: daemon_com.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/ihandle.h: ihandle.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/namei_ops.h: namei_ops.h
-	${INSTALL} $? $@
+dest: vlib.a salvager volinfo fssync-debug
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL_DATA} vlib.a ${DEST}/lib/afs/vlib.a
+	${INSTALL_DATA} vlib.a ${DEST}/lib/afs/libvlib.a
+	${INSTALL_PROGRAM} salvager ${DEST}/root.server/usr/afs/bin/salvager
+	${INSTALL_PROGRAM} volinfo ${DEST}/root.server/usr/afs/bin/volinfo
+	${INSTALL_DATA} nfs.h ${DEST}/include/afs/nfs.h
+	${INSTALL_DATA} vnode.h ${DEST}/include/afs/vnode.h
+	${INSTALL_DATA} viceinode.h ${DEST}/include/afs/viceinode.h
+	${INSTALL_DATA} volume.h ${DEST}/include/afs/volume.h
+	${INSTALL_DATA} voldefs.h ${DEST}/include/afs/voldefs.h
+	${INSTALL_DATA} partition.h ${DEST}/include/afs/partition.h
+	${INSTALL_DATA} fssync.h ${DEST}/include/afs/fssync.h
+	${INSTALL_DATA} salvsync.h ${DEST}/include/afs/salvsync.h
+	${INSTALL_DATA} daemon_com.h ${DEST}/include/afs/daemon_com.h
+	${INSTALL_DATA} ihandle.h ${DEST}/include/afs/ihandle.h
+	${INSTALL_DATA} namei_ops.h ${DEST}/include/afs/namei_ops.h
+	set -x; if test "@DEMAND_ATTACH@" = "no" ; then \
+		${INSTALL_PROGRAM} fssync-debug \
+			${DEST}/root.server/usr/afs/bin/fssync-debug ; \
+	fi
+	set -x; if test x"$(install_XFS_SIZE_CHECK)" != x"" ; then \
+		${INSTALL_PROGRAM} xfs_size_check \
+			$(DEST)/root.server/usr/afs/bin/xfs_size_check ; \
+	fi
+	set -x; if test x"$(install_FS_CONV_SOL26)" != x"" ; then \
+		${INSTALL_PROGRAM} fs_conv_sol26 \
+			$(DEST)/root.server/usr/afs/bin/fs_conv_sol26 ; \
+	fi

 #
 # Build targets
@ -195,9 +215,6 @@ fssync-debug: fssync-debug.o physio.o AFS_component_version_number.c ${LIBS}
 vol-bless: vol-bless.o physio.o ihandle.o ${LIBS}
 	${CC} ${CFLAGS} -o vol-bless vol-bless.o physio.o ${LIBS} ${XLIBS}

-fs_conv_dux40D: fs_conv_411.o ${LIBS}
-	${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_dux40D fs_conv_411.o  ${LIBS} ${XLIBS}
-
 fs_conv_sol26: fs_conv_411.o ${LIBS}
 	${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_sol26 fs_conv_411.o  ${LIBS} ${XLIBS}

@ -218,127 +235,6 @@ test:
 	cd test; $(MAKE)

 include ../config/Makefile.version
-${DESTDIR}${libdir}/afs/vlib.a: vlib.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/vlib.a: vlib.a
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libvlib.a: vlib.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libvlib.a: vlib.a
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvlibexecdir}/salvager: salvager
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvsbindir}/volinfo: volinfo
-	${INSTALL} -s $? $@
-
-${DESTDIR}${afssrvsbindir}/fssync-debug: fssync-debug
-	if test "@DEMAND_ATTACH@" = "no" ; then \
-		${INSTALL} -s $? $@ ; \
-	fi
-
-${DESTDIR}${includedir}/afs/nfs.h: nfs.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/nfs.h: nfs.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/vnode.h: vnode.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/vnode.h: vnode.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/viceinode.h: viceinode.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/viceinode.h: viceinode.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/volume.h: volume.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/volume.h: volume.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/voldefs.h: voldefs.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/voldefs.h: voldefs.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/partition.h: partition.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/partition.h: partition.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/fssync.h: fssync.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/fssync.h: fssync.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/salvsync.h: salvsync.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/salvsync.h: salvsync.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/daemon_com.h: daemon_com.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/daemon_com.h: daemon_com.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ihandle.h: ihandle.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ihandle.h: ihandle.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/namei_ops.h: namei_ops.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/namei_ops.h: namei_ops.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/salvage.h: salvage.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/salvage.h: salvage.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/vol-salvage.h: vol-salvage.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/vol-salvage.h: vol-salvage.h
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/lib/afs/vlib.a \
-	${DEST}/lib/afs/libvlib.a \
-	${DEST}/root.server/usr/afs/bin/salvager \
-	${DEST}/root.server/usr/afs/bin/volinfo \
-	${DEST}/root.server/usr/afs/bin/fssync-debug \
-	$(dest_FS_CONV_OSF40D) \
-	$(dest_XFS_SIZE_CHECK) \
-	$(dest_FS_CONV_SOL26) \
-	${DEST}/include/afs/nfs.h \
-	${DEST}/include/afs/vnode.h \
-	${DEST}/include/afs/viceinode.h \
-	${DEST}/include/afs/volume.h \
-	${DEST}/include/afs/voldefs.h \
-	${DEST}/include/afs/partition.h \
-	${DEST}/include/afs/fssync.h \
-	${DEST}/include/afs/salvsync.h \
-	${DEST}/include/afs/daemon_com.h \
-	${DEST}/include/afs/ihandle.h \
-	${DEST}/include/afs/namei_ops.h

 check-splint::
 	sh $(HELPER_SPLINT) $(CFLAGS) \
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@ -59,6 +59,15 @@ all: volserver vos restorevol voldump \
 	${TOP_INCDIR}/afs/volint.h \
 	${TOP_LIBDIR}/libvolser.a

+${TOP_INCDIR}/afs/volser.h: volser.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/volint.h: volint.h
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libvolser.a: libvolser.a
+	${INSTALL_DATA} $? $@
+
 restorevol: restorevol.c
 	${CC} ${CFLAGS} -o restorevol ${srcdir}/restorevol.c \
 		${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS}
@ -118,47 +127,63 @@ lockprocs.o: lockprocs.c ${VINCLS} ${INTINCLS} ${RINCLS}
 #
 # Installation targets
 #
-install: \
-	${DESTDIR}${sbindir}/restorevol \
-	${DESTDIR}${sbindir}/voldump \
-	${DESTDIR}${includedir}/afs/volser.h \
-	${DESTDIR}${includedir}/afs/volint.h \
-	${DESTDIR}${sbindir}/vos \
-	${DESTDIR}${afssrvsbindir}/vos \
-	${DESTDIR}${afssrvlibexecdir}/volserver \
-	${DESTDIR}${libdir}/afs/libvolser.a
-
-
-${DEST}/include/afs/volser.h: volser.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/volint.h: volint.h
-	${INSTALL} $? $@
-
-${DEST}/etc/restorevol: restorevol
-	${INSTALL} $? $@
-
-${DEST}/etc/voldump: voldump
-	${INSTALL} $? $@
-
-${DEST}/etc/vos ${DEST}/root.server/usr/afs/bin/vos: vos
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libvolser.a: libvolser.a
-	${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/volserver: volserver
+install: restorevol voldump volser.h volint.h vos volserver libvolser.a
+	${INSTALL} -d ${DESTDIR}${sbindir}
+	${INSTALL} -d ${DESTDIR}${afssrvsbindir}
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
+	${INSTALL_PROGRAM} restorevol ${DESTDIR}${sbindir}/restorevol
+	${INSTALL_PROGRAM} voldump ${DESTDIR}${sbindir}/voldump
+	${INSTALL_DATA} volser.h ${DESTDIR}${includedir}/afs/volser.h
+	${INSTALL_DATA} volint.h ${DESTDIR}${includedir}/afs/volint.h
+	${INSTALL_PROGRAM} vos ${DESTDIR}${sbindir}/vos
+	${INSTALL_PROGRAM} vos ${DESTDIR}${afssrvsbindir}/vos
+	${INSTALL_DATA} libvolser.a ${DESTDIR}${libdir}/afs/libvolser.a
 	@case ${SYS_NAME} in \
 	alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
-	echo "Don't install volserver for ${SYS_NAME}" ;; \
+		echo "Don't install volserver for ${SYS_NAME}" ;; \
 	*_darwin_[1-6][0-9]) \
-	echo ${INSTALL} -ns $? $@ ; \
-	${INSTALL} -ns $? $@ ;; \
+		echo ${INSTALL_PROGRAM} volserver \
+			${DESTDIR}${afssrvlibexecdir}/volserver ; \
+		${INSTALL_PROGRAM} volserver \
+			${DESTDIR}${afssrvlibexecdir}/volserver ;; \
 	*_darwin_*) \
-	echo "Don't install volserver for ${SYS_NAME}" ;; \
+		echo "Don't install volserver for ${SYS_NAME}" ;; \
 	*) \
-	echo ${INSTALL} -ns $? $@ ; \
-	${INSTALL} -ns $? $@ ;; \
+		echo ${INSTALL_PRORAM} volserver \
+			${DESTDIR}${afssrvlibexecdir}/volserver ; \
+		${INSTALL_PROGRAM} volserver \
+			${DESTDIR}${afssrvlibexecdir}/volserver ;; \
+	esac
+
+dest: restorevol voldump volser.h volint.h vos volserver libvolser.a
+	${INSTALL} -d ${DEST}/etc
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_PROGRAM} restorevol ${DEST}/etc/restorevol
+	${INSTALL_PROGRAM} voldump ${DEST}/etc/voldump
+	${INSTALL_DATA} volser.h ${DEST}/include/afs/volser.h
+	${INSTALL_DATA} volint.h ${DEST}/include/afs/volint.h
+	${INSTALL_PROGRAM} vos ${DEST}/etc/vos
+	${INSTALL_PROGRAM} vos ${DEST}/root.server/usr/afs/bin/vos
+	${INSTALL_DATA} libvolser.a ${DEST}/lib/afs/libvolser.a
+	@case ${SYS_NAME} in \
+	alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
+		echo "Don't install volserver for ${SYS_NAME}" ;; \
+	*_darwin_[1-6][0-9]) \
+		echo ${INSTALL_PROGRAM} volserver \
+			${DEST}/root.server/usr/afs/bin/volserver ; \
+		${INSTALL_PROGRAM} -ns volserver \
+			${DEST}/root.server/usr/afs/bin/volserver ;; \
+	*_darwin_*) \
+		echo "Don't install volserver for ${SYS_NAME}" ;; \
+	*) \
+		echo ${INSTALL_PROGRAM} volserver \
+			${DEST}/root.server/usr/afs/bin/volserver ; \
+		${INSTALL_PROGRAM} volserver \
+			${DEST}/root.server/usr/afs/bin/volserver ;; \
 	esac

 #
@ -168,66 +193,11 @@ clean:
 	$(RM) -f *.o *.a core volserver volint.ss.c volint.cs.c volint.h \
 	volint.xdr.c vos volser.h volerr.c AFS_component_version_number.c restorevol voldump

-include ../config/Makefile.version
-
-${DESTDIR}${sbindir}/restorevol: restorevol
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/voldump: voldump
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/volser.h: volser.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/volser.h: volser.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/volint.h: volint.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/volint.h: volint.h
-	${INSTALL} $? $@
-
-${DESTDIR}${sbindir}/vos: vos
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/vos: vos
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvlibexecdir}/volserver: volserver
-	@case ${SYS_NAME} in \
-	alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
-	echo "Don't install volserver for ${SYS_NAME}" ;; \
-	*_darwin_[1-6][0-9]) \
-	echo ${INSTALL} -ns $? $@ ; \
-	${INSTALL} -ns $? $@ ;; \
-	*_darwin_*) \
-	echo "Don't install volserver for ${SYS_NAME}" ;; \
-	*) \
-	echo ${INSTALL} -ns $? $@ ; \
-	${INSTALL} -ns $? $@ ;; \
-	esac
-
-${DESTDIR}${libdir}/afs/libvolser.a: libvolser.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libvolser.a: libvolser.a
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/etc/restorevol \
-	${DEST}/etc/voldump \
-	${DEST}/include/afs/volser.h \
-	${DEST}/include/afs/volint.h \
-	${DEST}/etc/vos \
-	${DEST}/root.server/usr/afs/bin/vos \
-	${DEST}/root.server/usr/afs/bin/volserver \
-	${DEST}/lib/afs/libvolser.a
-
-
 check-splint::
 	sh $(HELPER_SPLINT) $(CFLAGS) \
 	    vos.c restorevol.c \
 	    vsprocs.c vsutils.c lockprocs.c volerr.c \
 	    volmain.c volprocs.c physio.c common.c voltrans.c \
 	    dumpstuff.c
+
+include ../config/Makefile.version
--- a/src/xstat/Makefile.in
+++ b/src/xstat/Makefile.in
@ -28,6 +28,18 @@ all: \
 	xstat_fs_test \
 	xstat_cm_test

+${TOP_INCDIR}/afs/xstat_fs.h: xstat_fs.h
+	${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/xstat_cm.h: xstat_cm.h
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libxstat_fs.a: libxstat_fs.a
+	${INSTALL_DATA} $? $@
+
+${TOP_LIBDIR}/libxstat_cm.a: libxstat_cm.a
+	${INSTALL_DATA} $? $@
+
 #
 # File Server data collection
 #
@ -67,31 +79,29 @@ xstat_cm_test: xstat_cm_test.o libxstat_cm.a ${LIBS}
 #
 # Installation targets
 #
-install: \
-	${DESTDIR}${includedir}/afs/xstat_fs.h \
-	${DESTDIR}${includedir}/afs/xstat_cm.h \
-	${DESTDIR}${libdir}/afs/libxstat_fs.a \
-	${DESTDIR}${libdir}/afs/libxstat_cm.a \
-	${DESTDIR}${bindir}/xstat_fs_test \
-	${DESTDIR}${bindir}/xstat_cm_test
+install: xstat_fs.h xstat_cm.h libxstat_fs.a libxstat_cm.a xstat_fs_test \
+		xstat_cm_test
+	${INSTALL} -d ${DESTDIR}${includedir}/afs
+	${INSTALL} -d ${DESTDIR}${libdir}/afs
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL_DATA} xstat_fs.h ${DESTDIR}${includedir}/afs/xstat_fs.h
+	${INSTALL_DATA} xstat_cm.h ${DESTDIR}${includedir}/afs/xstat_cm.h
+	${INSTALL_DATA} libxstat_fs.a ${DESTDIR}${libdir}/afs/libxstat_fs.a
+	${INSTALL_DATA} libxstat_cm.a ${DESTDIR}${libdir}/afs/libxstat_cm.a
+	${INSTALL_PROGRAM} xstat_fs_test ${DESTDIR}${bindir}/xstat_fs_test
+	${INSTALL_PROGRAM} xstat_cm_test ${DESTDIR}${bindir}/xstat_cm_test

-${DEST}/include/afs/xstat_fs.h: xstat_fs.h
-	${INSTALL} $? $@
-
-${DEST}/include/afs/xstat_cm.h: xstat_cm.h
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libxstat_fs.a: libxstat_fs.a
-	${INSTALL} $? $@
-
-${DEST}/lib/afs/libxstat_cm.a: libxstat_cm.a
-	${INSTALL} $? $@
-
-${DEST}/bin/xstat_fs_test: xstat_fs_test
-	${INSTALL} $? $@
-
-${DEST}/bin/xstat_cm_test: xstat_cm_test
-	${INSTALL} $? $@
+dest: xstat_fs.h xstat_cm.h libxstat_fs.a libxstat_cm.a xstat_fs_test \
+		xstat_cm_test
+	${INSTALL} -d ${DEST}/include/afs
+	${INSTALL} -d ${DEST}/lib/afs
+	${INSTALL} -d ${DEST}/bin
+	${INSTALL_DATA} xstat_fs.h ${DEST}/include/afs/xstat_fs.h
+	${INSTALL_DATA} xstat_cm.h ${DEST}/include/afs/xstat_cm.h
+	${INSTALL_DATA} libxstat_fs.a ${DEST}/lib/afs/libxstat_fs.a
+	${INSTALL_DATA} libxstat_cm.a ${DEST}/lib/afs/libxstat_cm.a
+	${INSTALL_PROGRAM} xstat_fs_test ${DEST}/bin/xstat_fs_test
+	${INSTALL_PROGRAM} xstat_cm_test ${DEST}/bin/xstat_cm_test

 #
 # Misc targets
@ -100,42 +110,3 @@ clean:
 	$(RM) -f *.o *.a xstat_fs_test xstat_cm_test core AFS_component_version_number.c

 include ../config/Makefile.version
-
-${DESTDIR}${includedir}/afs/xstat_fs.h: xstat_fs.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/xstat_fs.h: xstat_fs.h
-	${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/xstat_cm.h: xstat_cm.h
-	${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/xstat_cm.h: xstat_cm.h
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libxstat_fs.a: libxstat_fs.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libxstat_fs.a: libxstat_fs.a
-	${INSTALL} $? $@
-
-${DESTDIR}${libdir}/afs/libxstat_cm.a: libxstat_cm.a
-	${INSTALL} $? $@
-
-${TOP_LIBDIR}/libxstat_cm.a: libxstat_cm.a
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/xstat_fs_test: xstat_fs_test
-	${INSTALL} $? $@
-
-${DESTDIR}${bindir}/xstat_cm_test: xstat_cm_test
-	${INSTALL} $? $@
-
-dest: \
-	${DEST}/include/afs/xstat_fs.h \
-	${DEST}/include/afs/xstat_cm.h \
-	${DEST}/lib/afs/libxstat_fs.a \
-	${DEST}/lib/afs/libxstat_cm.a \
-	${DEST}/bin/xstat_fs_test \
-	${DEST}/bin/xstat_cm_test
-