diff options
| author | Philip Balister <philip@balister.org> | 2007-08-18 11:41:29 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-08-18 11:41:29 +0000 |
| commit | 9a58dd39de61f72a335daa985614db39eab8691d (patch) | |
| tree | 60d983c8bcd185b18f8b8794b17a0f6dfb171c5e | |
| parent | e5c17bb0e08c5b5d76f8479c742df498fb40e36c (diff) | |
| parent | c80b8c18df2b36fa0ba5c0731a15eb40ff502908 (diff) | |
merge of '2f59921c707cbaf0d9cf6efc81b2c89ef6be04bd'
and 'e4773d4add8eb87abae550658daa23ce8a2065fa'
| -rw-r--r-- | packages/netbase/netbase_4.21.bb | 6 | ||||
| -rw-r--r-- | packages/scummvm/scummvm.inc | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 6775008ea5..f9be31845c 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r20" +PR = "r21" inherit update-rc.d @@ -54,4 +54,6 @@ do_install () { install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces } -CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces" +CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts \ + ${sysconfdir}/network/interfaces ${sysconfdir}/rpc \ + ${sysconfdir}/protocols ${sysconfdir}/services" diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 28257fab4b..5362a2884f 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -11,18 +11,14 @@ EXTRA_OECONF = "--host=${HOST_SYS} \ --backend=sdl \ --with-sdl-prefix=${STAGING_BINDIR_NATIVE}/.. \ --disable-alsa \ + --prefix=${prefix} \ --with-ogg-prefix=${STAGING_LIBDIR}/.. \ --with-vorbis-prefix=${STAGING_LIBDIR}/.. \ --with-mpeg2-prefix=${STAGING_LIBDIR}/.. \ --with-mad-prefix=${STAGING_LIBDIR}/.. " +EXTRA_OEMAKE = "MANDIR=${mandir}" + do_configure() { ./configure ${EXTRA_OECONF} } - - -do_install() { - install -d ${D}${bindir} - install -m 0755 scummvm ${D}${bindir}/scummvm -} - |