ncurse, readline: use autotools_stage_all

diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc
index f400617..96679db 100644 (file)
--- a/packages/ncurses/ncurses.inc
+++ b/packages/ncurses/ncurses.inc
@@ -33,14 +33,8 @@ export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
 export BUILD_LDFLAGS = ""
 export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
 
-do_stage () {
-       for i in libncurses libpanel libform libmenu; do
-               oe_libinstall -so -a -C lib $i ${STAGING_LIBDIR}
-       done
-       for h in ncurses_*.h curses.h eti.h form.h menu.h panel.h \
-               termcap.h term.h unctrl.h; do
-                      install -m 0644 include/$h ${STAGING_INCDIR}/
-       done
+do_stage() {
+       autotools_stage_all
        ln -sf curses.h ${STAGING_INCDIR}/ncurses.h
        ln -sf libncurses.so ${STAGING_LIBDIR}/libtermcap.so
        ln -sf libncurses.a ${STAGING_LIBDIR}/libtermcap.a

diff --git a/packages/readline/readline_4.3.bb b/packages/readline/readline_4.3.bb
index 234d697..d0ff2a8 100644 (file)
--- a/packages/readline/readline_4.3.bb
+++ b/packages/readline/readline_4.3.bb
@@ -4,12 +4,11 @@ additional functions to maintain a list of previously-entered command lines, to
 lines, and perform csh-like history expansion on previous commands."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPLv2"
 DEPENDS += "ncurses"
 RPROVIDES_${PN} += "readline"
 LEAD_SONAME = "libreadline.so"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \
           file://shlink-termcap.patch;patch=1 \
@@ -23,24 +22,13 @@ do_configure () {
        autotools_do_configure
 }
 
+do_stage() {
+       autotools_stage_all
+}
+
 do_install () {
        autotools_do_install
        # Make install doesn't properly install these
        oe_libinstall -so -C shlib libhistory ${D}${libdir}
        oe_libinstall -so -C shlib libreadline ${D}${libdir}
 }
-
-do_stage() {
-       oe_libinstall -a libhistory ${STAGING_LIBDIR}
-       oe_libinstall -a libreadline ${STAGING_LIBDIR}
-       oe_libinstall -so -C shlib libhistory ${STAGING_LIBDIR}
-       oe_libinstall -so -C shlib libreadline ${STAGING_LIBDIR}
-
-       install -d ${STAGING_INCDIR}/readline
-       for f in readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h \
-         rlconf.h rltypedefs.h
-       do
-               install -m 0644 $f ${STAGING_INCDIR}/readline/
-       done
-
-}