From 249e73f99759e80bf36ef51853572a53daae4d2d Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 29 Jan 2000 12:01:52 +0000
Subject: [PATCH] Move the header installation down into `readline' which is
 the subsystem the headers are part of.

---
 gnu/lib/libreadline/Makefile          | 13 +------------
 gnu/lib/libreadline/readline/Makefile |  7 +++++++
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 31650321000b..637dcc8a5733 100644
--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@@ -2,15 +2,4 @@
 
 SUBDIR = history readline
 
-SRCDIR= ${.CURDIR}/../../../contrib/libreadline
-
-INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
-		   rlstdc.h rlconf.h
-
-beforeinstall:
-.for i in ${INSTALLED_HEADERS}
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${SRCDIR}/$i \
-		${DESTDIR}/usr/include/readline
-.endfor
-
-.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index e539fb802f7a..740104a6443c 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -12,7 +12,14 @@ SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
 	  nls.c xmalloc.c \
 	  $(HISTSRC) $(TILDESRC)
 
+INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
+		   rlstdc.h rlconf.h
+
 DPADD+= $(LIBTERMCAP)
 LDADD+= -ltermcap
 
+.for hdr in ${INSTALLED_HEADERS}
+INCS+=	${SRCDIR}/${hdr}
+.endfor
+
 .include <bsd.lib.mk>