diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2007-11-18 00:45:00 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-11-18 00:45:00 +0000 |
| commit | bbdf99288aa693ba22a4256eb225187027f1fee5 (patch) | |
| tree | 9426e2df11d0a84b7ab4fbd28c4562d9251950cb /packages/gnome | |
| parent | 73c0be6148f1ccfae4a9eb53265a74090d6f68aa (diff) | |
packages: Remove various hardcoded staging layout assumptions
Diffstat (limited to 'packages/gnome')
| -rw-r--r-- | packages/gnome/gnome-desktop_2.10.2.bb | 4 | ||||
| -rw-r--r-- | packages/gnome/gnome-desktop_2.16.1.bb | 4 | ||||
| -rw-r--r-- | packages/gnome/gnome-desktop_2.18.3.bb | 2 | ||||
| -rw-r--r-- | packages/gnome/gnome-desktop_2.7.90.bb | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb index 9957921327..b8e098f40c 100644 --- a/packages/gnome/gnome-desktop_2.10.2.bb +++ b/packages/gnome/gnome-desktop_2.10.2.bb @@ -6,10 +6,10 @@ inherit gnome pkgconfig DEPENDS = "gnome-common libgnomeui" -EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" +EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" do_configure_prepend () { - cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S} + cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} } do_stage () { diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb index 4d4b80efbc..69de709350 100644 --- a/packages/gnome/gnome-desktop_2.16.1.bb +++ b/packages/gnome/gnome-desktop_2.16.1.bb @@ -11,10 +11,10 @@ SRC_URI += "file://scrollkeeper.patch;patch=1 \ EXTRA_OECONF = "--disable-scrollkeeper" -EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" +EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" do_configure_prepend () { - cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S} + cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} } FILES_${PN} += "${datadir}/gnome-about" diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb index e341fd31ab..c2888bf2a4 100644 --- a/packages/gnome/gnome-desktop_2.18.3.bb +++ b/packages/gnome/gnome-desktop_2.18.3.bb @@ -12,7 +12,7 @@ SRC_URI += "file://scrollkeeper.patch;patch=1 \ EXTRA_OECONF = "--disable-scrollkeeper" do_configure_prepend () { - cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S} + cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} } FILES_${PN} += "${datadir}/gnome-about" diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb index 54a6559d05..c7fd61470d 100644 --- a/packages/gnome/gnome-desktop_2.7.90.bb +++ b/packages/gnome/gnome-desktop_2.7.90.bb @@ -6,10 +6,10 @@ inherit gnome DEPENDS = "gnome-common libgnomeui" -EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" +EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" do_configure_prepend () { - cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S} + cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} } do_stage () { |