2 files changed, 8 insertions, 12 deletions
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 3165032..637dcc8 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 e539fb8..740104a 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>