From 5799a68ba61d06f14aca0a1fdb0a9544c19c5837 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 30 Aug 2001 07:07:16 +0000
Subject: [PATCH] config-makefile-further-cleanup-20010830

ordering of dependancies caused ${DESTDIR}/include/afs to not exist in
time, masked if you built into an existing destdir. so let's make
the makefile simpler and more logically paraallel.

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

get missing backquote
---
 src/config/Makefile.in | 60 ++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index c12c266ab..590b5fe58 100644
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -65,36 +65,11 @@ ${DESTDIR}/bin/mkvers: mkvers
 KDIRS = ${KERNELDIR}/afs \
 	${KERNELDIR}/rx \
 	${KERNELDIR}/afsint \
-	${DESTDIR}/include/afs \
 	${KERNELDIR}/config
 
 $(KDIRS): 
 	mkdir -p $@
 
-${KERNELDIR}/afs/param.h ${DESTDIR}/include/afs/param.h: param.${SYS_NAME}.h
-	-$(INST)
-
-${KERNELDIR}/afs/afs_sysnames.h ${DESTDIR}/include/afs/afs_sysnames.h: afs_sysnames.h
-	$(INST)
-
-${KERNELDIR}/afs/stds.h ${DESTDIR}/include/afs/stds.h: stds.h
-	$(INST)
-
-${KERNELDIR}/config/Makefile.${SYS_NAME}: Makefile.${SYS_NAME}
-	$(INST)
-
-${KERNELDIR}/afs/icl.h ${DESTDIR}/include/afs/icl.h: icl.h 
-	$(INST)
-
-${KERNELDIR}/afs/afs_args.h ${DESTDIR}/include/afs/afs_args.h: afs_args.h 
-	$(INST)
-
-${DESTDIR}/include/afs/venus.h: venus.h 
-	$(INST)
-
-${DESTDIR}/include/afs/debug.h: debug.h 
-	$(INST)
-
 UKDIRS = ${UKERNELDIR}/afs \
 	${UKERNELDIR}/rx \
 	${UKERNELDIR}/afsint \
@@ -103,25 +78,36 @@ UKDIRS = ${UKERNELDIR}/afs \
 $(UKDIRS): 
 	mkdir -p $@
 
-${UKERNELDIR}/afs/param.h: param.${SYS_NAME}_usr.h
+HDIRS = ${DESTDIR}/include/afs 
+
+$(HDIRS): 
+	mkdir -p $@
+
+${KERNELDIR}/afs/param.h ${DESTDIR}/include/afs/param.h: param.${SYS_NAME}.h
+	-$(INST)
+
+${UKERNELDIR}/afs/afs_sysnames.h ${KERNELDIR}/afs/afs_sysnames.h ${DESTDIR}/include/afs/afs_sysnames.h: afs_sysnames.h
 	$(INST)
 
-${UKERNELDIR}/afs/afs_sysnames.h: afs_sysnames.h
+${UKERNELDIR}/afs/stds.h ${KERNELDIR}/afs/stds.h ${DESTDIR}/include/afs/stds.h: stds.h
 	$(INST)
 
-${UKERNELDIR}/afs/stds.h: stds.h
+${UKERNELDIR}/config/Makefile.${SYS_NAME} ${KERNELDIR}/config/Makefile.${SYS_NAME}: Makefile.${SYS_NAME}
 	$(INST)
 
-${UKERNELDIR}/config/Makefile.${SYS_NAME}: Makefile.${SYS_NAME}
+${UKERNELDIR}/afs/icl.h ${KERNELDIR}/afs/icl.h ${DESTDIR}/include/afs/icl.h: icl.h 
 	$(INST)
 
-${UKERNELDIR}/afs/icl.h: icl.h 
+${UKERNELDIR}/afs/afs_args.h ${KERNELDIR}/afs/afs_args.h ${DESTDIR}/include/afs/afs_args.h: afs_args.h 
 	$(INST)
 
-${UKERNELDIR}/afs/venus.h: venus.h 
+${UKERNELDIR}/afs/venus.h ${DESTDIR}/include/afs/venus.h: venus.h 
 	$(INST)
 
-${UKERNELDIR}/afs/afs_args.h: afs_args.h 
+${DESTDIR}/include/afs/debug.h: debug.h 
+	$(INST)
+
+${UKERNELDIR}/afs/param.h: param.${SYS_NAME}_usr.h
 	$(INST)
 
 # these are needed to compile the kernel.  Config is necessary to
@@ -132,15 +118,19 @@ ${UKERNELDIR}/afs/afs_args.h: afs_args.h
 install: config \
 	$(DESTDIR)/bin \
 	$(DESTDIR)/bin/mkvers \
+	hinstall \
+	ukinstall \
+	kinstall 
+
+hinstall: \
+	$(HDIRS) \
 	${DESTDIR}/include/afs/param.h \
 	${DESTDIR}/include/afs/stds.h \
 	${DESTDIR}/include/afs/afs_sysnames.h \
 	${DESTDIR}/include/afs/afs_args.h \
 	${DESTDIR}/include/afs/icl.h \
 	${DESTDIR}/include/afs/venus.h \
-	${DESTDIR}/include/afs/debug.h \
-	ukinstall \
-	kinstall 
+	${DESTDIR}/include/afs/debug.h 
 
 kinstall: \
 	$(KDIRS) \
-- 
2.39.5