From 4962050e9783502ec0465ae1b6a4103563385198 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 9 Mar 2012 22:05:49 +0000
Subject: [PATCH] Install bits/stdio_lim.h in install-headers.

---
 ChangeLog             | 7 +++++++
 Makerules             | 4 +++-
 stdio-common/Makefile | 7 +------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3cc0d2d..79d9dc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-09  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makerules ($(inst_includedir)/%.h): New rule.
+	* stdio-common/Makefile (headers): Add bits/stdio_lim.h.
+	(install-others): Remove variable setting.
+	($(inst_includedir)/bits/stdio_lim.h): Remove rule.
+
 2012-03-08  Richard Henderson  <rth@twiddle.net>
 
 	* sysdeps/powerpc/fpu/math_private.h (__ieee754_sqrt): Convert
diff --git a/Makerules b/Makerules
index 7d18f89..f1807c2 100644
--- a/Makerules
+++ b/Makerules
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1991-2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -1068,6 +1068,8 @@ ifdef headers
 # headers in the sysdeps tree.
 $(inst_includedir)/%.h: $(objpfx)%.h $(+force)
 	$(do-install)
+$(inst_includedir)/%.h: $(common-objpfx)%.h $(+force)
+	$(do-install)
 $(inst_includedir)/%.h: %.h $(+force)
 	$(do-install)
 $(inst_includedir)/%.h: $(..)include/%.h $(+force)
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 266147e..8cf6335 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -20,7 +20,7 @@
 #
 subdir	:= stdio-common
 
-headers	:= stdio_ext.h printf.h bits/printf-ldbl.h
+headers	:= stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h
 
 routines	:=							      \
 	ctermid cuserid							      \
@@ -39,8 +39,6 @@ routines	:=							      \
 	isoc99_vsscanf							      \
 	psiginfo
 
-install-others = $(inst_includedir)/bits/stdio_lim.h
-
 include ../Makeconfig
 
 aux	:= errlist siglist printf-parsemb printf-parsewc fxprintf
@@ -64,9 +62,6 @@ test-srcs = tst-unbputc tst-printf
 
 include ../Rules
 
-$(inst_includedir)/bits/stdio_lim.h: $(common-objpfx)bits/stdio_lim.h $(+force)
-	$(do-install)
-
 ifeq ($(cross-compiling),no)
 .PHONY: do-tst-unbputc do-tst-printf
 tests: do-tst-unbputc do-tst-printf
-- 
2.7.4