From eb99cedbb19533357806b68033761b7f3aff625b Mon Sep 17 00:00:00 2001
From: Thomas Bushnell <thomas@gnu.org>
Date: Tue, 13 Aug 1996 18:10:31 +0000
Subject: *** empty log message ***

---
 ChangeLog      | 11 +++++++++++
 Makeconf       | 18 ++++++++++++++++--
 config.make.in |  6 ------
 configure.in   |  5 +----
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 055c3ad9..aca6768b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Aug 13 14:05:54 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* Makeconf (vpath %.defs): Remove reference for mach and device
+	headers. 
+	(mach_defs_names, device_defs,names, mach_defs, device_defs): New
+	variables. 
+	($(mach_defs), $(device_defs)): New rules.
+	* config.make.in (install_prefix, install_includedir): Delete
+	variables. 
+	* configure.in (install_prefix): Delete AC_SUBST.
+
 Mon Aug 12 12:51:03 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
 	* Makeconf: Comment out the lines that cause recursive makes into
diff --git a/Makeconf b/Makeconf
index d026464b..fcd60708 100644
--- a/Makeconf
+++ b/Makeconf
@@ -330,9 +330,23 @@ vpath libutil.% $(libdir)/
 	| $(MIGCOM) $(MIGCOMUFLAGS) $($*-MIGCOMUFLAGS) \
 		    -user $*User.c -server /dev/null -header $*_U.h
 
-
 # Where to find .defs files.
-vpath %.defs $(top_srcdir)/hurd $(install_includedir)/mach $(install_includedir)/device
+vpath %.defs $(top_srcdir)/hurd
+
+# These we want to find in the libc include directory...
+mach_defs_names = bootstrap default_pager default_pager_helper exc mach mach4 \
+	mach_host mach_norma mach_port mach_timer_reply memory_object \
+	memory_object_default norma_task notify
+device_defs_names = dev_forward device device_reply device_request
+
+mach_defs = $(addsuffix .defs,$(mach_defs_names))
+device_defs = $(addsuffix .defs,$(device_defs_names))
+
+$(mach_defs): %.defs:
+	echo '#include <mach/$@>' > $@
+$(device_defs): %.defs:
+	echo '#include <device/$@>' > $@
+
 
 FORCE:
 
diff --git a/config.make.in b/config.make.in
index 427347ab..4dbe7513 100644
--- a/config.make.in
+++ b/config.make.in
@@ -20,12 +20,6 @@ sysconfdir = $(prefix)/etc
 localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
 
-# Where the installation dir is to be found during compilation
-install_prefix = @install_prefix@
-
-# Where to find libc header files during compilation
-install_includedir = $(install_prefix)/include
-
 # All of those directories together:
 installationdirlist = $(hurddir) $(libdir) $(bindir) $(sbindir) \
 	$(includedir) $(libexecdir) $(infodir) $(sysconfdir) \
diff --git a/configure.in b/configure.in
index 1492baca..2546be9b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION([$Id: configure.in,v 1.6 1996/08/08 18:54:32 thomas Exp $])
+AC_REVISION([$Id: configure.in,v 1.7 1996/08/13 18:10:06 thomas Exp $])
 AC_PREREQ(2.4)			dnl Minimum Autoconf version required.
 AC_INIT(hurd/hurd_types.h)	dnl A distinctive file to look for in srcdir.
 
 AC_PREFIX_DEFAULT()		dnl Default to empty prefix, not /usr/local.
 
-test "x$install_prefix" = xNONE && install_prefix='$prefix'
-AC_SUBST(install_prefix)
-
 AC_CANONICAL_HOST
 case "$host_os" in
 gnu*) ;;
-- 
cgit v1.2.3