From af74c43f0fd7494d843e66f27e1a98448ee9c723 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 28 Mar 2010 15:23:29 +0200 Subject: ppp: convert to new style staging --- recipes/ppp/ppp_2.4.3.bb | 7 ++----- recipes/ppp/ppp_2.4.4.bb | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'recipes/ppp') diff --git a/recipes/ppp/ppp_2.4.3.bb b/recipes/ppp/ppp_2.4.3.bb index 4c7b16876f..6936dd98cc 100644 --- a/recipes/ppp/ppp_2.4.3.bb +++ b/recipes/ppp/ppp_2.4.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon" HOMEPAGE = "http://samba.org/ppp/" DEPENDS = "libpcap" LICENSE = "BSD GPLv2" -PR = "r7" +PR = "r8" SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://ppp-2.4.3-mppe-mppc-1.1.patch;patch=1 \ @@ -30,11 +30,8 @@ inherit autotools EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin" EXTRA_OECONF = "--disable-strip" -do_stage () { - make INCDIR=${STAGING_INCDIR} install-devel -} - do_install_append () { + make INCDIR=${includedir} install-devel make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ diff --git a/recipes/ppp/ppp_2.4.4.bb b/recipes/ppp/ppp_2.4.4.bb index b76a0c2e27..81ec3e0737 100644 --- a/recipes/ppp/ppp_2.4.4.bb +++ b/recipes/ppp/ppp_2.4.4.bb @@ -32,11 +32,8 @@ inherit autotools EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" EXTRA_OECONF = "--disable-strip" -do_stage () { - make INCDIR=${STAGING_INCDIR} install-devel -} - do_install_append () { + make INCDIR=${includedir} install-devel make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ -- cgit 1.2.3-korg