[commits] r1525 - in /trunk/libc: ChangeLog.eglibc Makefile

[jimb@xxxxxxxxxx]

Author: jimb
Date: Tue Feb 20 15:36:02 2007
New Revision: 1525

Log:
	* Makefile (install-headers): Preserve old behavior: depend on
	$(inst_includedir)/gnu/stubs.h only if install-bootstrap-headers
	is set; otherwise, place gnu/stubs.h on the 'install-others' list.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/Makefile

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Tue Feb 20 15:36:02 2007
@@ -1,4 +1,8 @@
 2007-02-20  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+	* Makefile (install-headers): Preserve old behavior: depend on
+	$(inst_includedir)/gnu/stubs.h only if install-bootstrap-headers
+	is set; otherwise, place gnu/stubs.h on the 'install-others' list.
 
 	* nptl/sysdeps/pthread/configure: Regenerate.
 

Modified: trunk/libc/Makefile
==============================================================================
--- trunk/libc/Makefile (original)
+++ trunk/libc/Makefile Tue Feb 20 15:36:02 2007
@@ -78,8 +78,17 @@
 vpath %.h $(subdir-dirs)
 
 # What to install.
+install-bin-script =
+
+# If we're bootstrapping, install a dummy gnu/stubs.h along with the
+# other headers, so 'make install-headers' produces a useable include
+# tree.  Otherwise, install gnu/stubs.h later, after the rest of the
+# build is done.
+ifeq ($(install-bootstrap-headers),yes)
 install-headers: $(inst_includedir)/gnu/stubs.h
-install-bin-script =
+else
+install-others = $(inst_includedir)/gnu/stubs.h
+endif
 
 ifeq (yes,$(build-shared))
 headers += gnu/lib-names.h