* Makerules (install-lib.so rules): Undouble $s in target and dep

 	parts of o-iterator-doit defns.
	(unversioned libraries install rule): Fix pattern.

	* mach/Makefile (mach-src-headers): Use $(base-machine) instead of
	$(config-machine).
	($(includedir)/machine): Likewise.

	* config.make.in (base-machine): New variable.
	* configure.in (machine): Move case stmt to set $machine out of sysdep
	dirs AC_CACHE_CHECK.
	(base_machine): New variable, set in that switch and AC_SUBST'd.

	* Makerules (stub-$(subdir)): Use file name in directory as output,
	since cmd is cd'd.

1 files changed, 2 insertions, 2 deletions

diff --git a/mach/Makefile b/mach/Makefile
index b48cabfeb2..747a6bfead 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -68,7 +68,7 @@ vpath %.defs $(mach-srcdir)
 # Install all .h and .defs files we find in some of the kernel's source
 # directories and their subdirectories (in MK82, max one level deep).
 mach-src-headers := $(wildcard $(foreach dir,mach device mach_debug \
-					     $(config-machine),\
+					     $(base-machine),\
 					 $(addprefix $(mach-srcdir)/$(dir)/,\
 						     *.defs *.h \
 						     */*.defs */*.h)))
@@ -91,7 +91,7 @@ $(includedir)/%: $(mach-srcdir)/%; $(do-install)
 install-others += $(includedir)/mach/machine $(includedir)/machine
 $(includedir)/mach/machine $(includedir)/machine: $(common-objpfx)config.make
 	-rm -f $@
-	cd $(@D); ln -s $(config-machine) $(@F)
+	cd $(@D); ln -s $(base-machine) $(@F)
 
 # Install Mach's <sys/version.h> as <mach/version.h>.
 install-others += $(includedir)/mach/version.h