*** empty log message ***

3 files changed, 46 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 8dace202..7f6c5313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,36 @@ Sun Sep  1 14:03:20 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 	$(BUGADDR), and $(BUGADDR_REF) to the flags.
 	(BUGADDR, BUGADDR_REF): New variables.
 	* Makefile (lib-subdirs): Add libhurdbugaddr.
+	* libhurdbugaddr: New directory.
+	
+Thu Aug 29 14:14:04 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* Makeconf [doinst == one] (install): Don't depend on
+ 	$(installationdir).
+	[doinst==one] ($(installationdir)/$(target)): Do depend on
+ 	$(installationdir).
+	[doinst == many] (install): Don't depend on $(installationdir).
+  	$(addprefix $(installationdir)/,$(targets)): Depend on
+ 	$(installationdir).
+	[makemode == library] (install): Don't depend on $(libdir),
+ 	$(includedir), or $(includedir)/$(installhdrsubdir).
+	[makemode == library] ($(libdir)/$(libname.a)): Depend on
+ 	$(libdir).
+	[makemode == library] ($(libdir)/$(libname).so): Likewise.
+	[makemode == library] $(addprefix
+ 	$(includedir)/$(installhdrsubdir)/,$(installhdrs)): Depend on
+ 	$(includdir)/$(installhdrsubdir)
+	[makemode == library] $(includedir)/$(installhdrsubdir): Depend on
+	$(includedir).
+	[makemode == library] (install-headers): Don't depend on
+	$(includedir)/$(installhdrsubdir) or $(includedir).
+
+	* INSTALL: Tell people to delete Mach's mach_init.h if it got
+	installed. 
+
+Wed Aug 28 11:22:28 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* INSTALL: Say to use `no_deps=t' when installing headers.
 
 Tue Aug 13 17:54:53 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
diff --git a/INSTALL b/INSTALL
index 1a88cf73..10ef040c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -66,10 +66,13 @@ Building the Hurd, Mach4, and libc together
 3. Do `make install' in <mach4-build>/mig.  ONLY.
 
 4. Do `make install' in <mach4-build>/include.  ONLY.
+   This may have installed an include file called mach_init.h.  If so,
+   delete it; you want to use the one that libc will install, and if
+   this file exists, libc might not install its version.
 
 5. Configure the Hurd with `configure'.
 
-6. In the Hurd directory, type `make install-hdrs'.
+6. In the Hurd directory, type `make install-hdrs no_deps=t'.
 
 7. Configure libc.
 
@@ -88,7 +91,7 @@ Building the Hurd and libc together
 1. `cd' to the directory containing the Hurd's source code and type
    `./configure' to configure the Hurd.
 
-2. Type `make install-hdrs' to install the Hurd's header files.
+2. Type `make install-hdrs no_deps=t' to install the Hurd's header files.
 
 3. Follow the instructions in the GNU C Library for configuring and
    installing GNU libc.
diff --git a/Makeconf b/Makeconf
index b9e0b92e..028ac391 100644
--- a/Makeconf
+++ b/Makeconf
@@ -131,14 +131,15 @@ BUGADDR_REF = -uargp_program_bug_address
 # Installation
 ifeq ($(doinst),one)
 all: $(target)
-install: $(installationdir)/$(target) $(installationdir)
-$(installationdir)/$(target): $(target)
+install: $(installationdir)/$(target)
+$(installationdir)/$(target): $(target) $(installationdir)
 	$(INSTALL_PROGRAM) $(INSTALL-$<-ops) $< $@
 endif
 
 ifeq ($(doinst),many)
 all: $(targets)
-install: $(addprefix $(installationdir)/,$(targets)) $(installationdir)
+install: $(addprefix $(installationdir)/,$(targets))
+$(addprefix $(installationdir)/,$(targets)): $(installationdir)
 $(addprefix $(installationdir)/,$(targets)): $(installationdir)/%: %
 	$(INSTALL_PROGRAM) $(INSTALL-$<-ops) $< $@
 endif
@@ -147,11 +148,11 @@ ifeq ($(makemode),library)
 all: libs
 install libs: add-to-librecord
 add-to-librecord: $(targets)
-install: $(addprefix $(libdir)/,$(targets)) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) $(libdir) $(includedir) $(includedir)/$(installhdrsubdir)
+install: $(addprefix $(libdir)/,$(targets)) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) 
 
-install-headers: $(includedir)/$(installhdrsubdir) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) $(includedir)
+install-headers: $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) 
 
-$(includedir)/$(installhdrsubdir):
+$(includedir)/$(installhdrsubdir): $(includedir)
 	$(MKINSTALLDIRS) $@
 
 # Arrange to have the headers installed locally anytime we build the library.
@@ -168,12 +169,14 @@ $(INSTALLED_LOCAL_HEADERS): $(top_srcdir)/$(installhdrsubdir)/%:
 endif
 libs: $(INSTALLED_LOCAL_HEADERS)
 
-$(libdir)/$(libname).a: $(libname).a
+$(libdir)/$(libname).a: $(libname).a $(libdir)
 	$(INSTALL_DATA) $(libname).a $(libdir)/$(libname).a
 	$(RANLIB) $(libdir)/$(libname).a
-$(libdir)/$(libname).so: $(libname).so
+$(libdir)/$(libname).so: $(libname).so $(libdir)
 	$(INSTALL_DATA) $(libname).so $(libdir)/$(libname).so
 
+$(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)): $(includdir)/$(installhdrsubdir)
+
 $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)): $(includedir)/$(installhdrsubdir)/%: %
 	$(INSTALL_DATA) $< $@