nautilus: Drop using autotools-brokensep
authorKhem Raj <raj.khem@gmail.com>
Tue, 2 Sep 2014 07:39:35 +0000 (00:39 -0700)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:42:16 +0000 (08:42 -0800)
(From meta-openembedded rev: 7ac650f4272fdaee6506d29275ffdce1d4f42cdd)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb

index 58a45b1..4be3f08 100644 (file)
@@ -11,7 +11,7 @@ PR = "r6"
 DEPENDS = "gdk-pixbuf gtk+ libunique gvfs librsvg libexif esound gnome-desktop orbit2-native"
 # optional: tracker
 
-inherit gnome autotools-brokensep
+inherit gnome
 
 SRC_URI[archive.md5sum] = "51565aa10d1625dff56e381228346911"
 SRC_URI[archive.sha256sum] = "2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057584d22d15347a2"
@@ -26,10 +26,10 @@ EXTRA_OECONF = " --disable-gtk-doc  --disable-update-mimedb "
 export SYSROOT = "${STAGING_DIR_HOST}"
 
 do_configure() {
-    sed -i -e /docs/d Makefile.am
+    sed -i -e /docs/d ${S}/Makefile.am
     autotools_do_configure
     # We need native orbit-idl with target idl files. No way to say it in a clean way:
-    find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \;
+    find ${B} -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \;
 }
 
 RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-networking"