diff options
| author | Openmoko anonymizer key <devel@lists.openmoko.org> | 2007-09-02 22:14:36 +0000 |
|---|---|---|
| committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2007-09-02 22:14:36 +0000 |
| commit | c1cfc8256ffcde3d0afd4de42b6f36b715c60dcb (patch) | |
| tree | dbd86d9a8c2879937d1b40602fc97597470329e6 /packages/gnome | |
| parent | 98081bc36be3bb72de6ff3e57bc1a713fb453879 (diff) | |
| parent | 31d144ff07c336393c2bc55ee5e486e17ee0bcfb (diff) | |
merge of '761183d571c60b5df965993faf1c23d3f933718b'
and 'd52a54d5f2ae378fe03f9c8d4cfb66d2d6a45d41'
Diffstat (limited to 'packages/gnome')
| -rw-r--r-- | packages/gnome/gnome-common-2.18.0/.mtn2git_empty (renamed from packages/gnome/gnome-common/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/gnome/gnome-common-2.18.0/omf.patch (renamed from packages/gnome/gnome-common/omf.patch) | 2 | ||||
| -rw-r--r-- | packages/gnome/gnome-common_2.18.0.bb (renamed from packages/gnome/gnome-common_2.4.0.bb) | 7 | ||||
| -rw-r--r-- | packages/gnome/libsoup_2.2.100.bb | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/packages/gnome/gnome-common/.mtn2git_empty b/packages/gnome/gnome-common-2.18.0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnome/gnome-common/.mtn2git_empty +++ b/packages/gnome/gnome-common-2.18.0/.mtn2git_empty diff --git a/packages/gnome/gnome-common/omf.patch b/packages/gnome/gnome-common-2.18.0/omf.patch index 334425e4b2..0d85b001e0 100644 --- a/packages/gnome/gnome-common/omf.patch +++ b/packages/gnome/gnome-common-2.18.0/omf.patch @@ -9,5 +9,5 @@ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + fi; \ done - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.18.0.bb index fc67bf9243..2991db81c7 100644 --- a/packages/gnome/gnome-common_2.4.0.bb +++ b/packages/gnome/gnome-common_2.18.0.bb @@ -20,8 +20,9 @@ do_stage () { mkdir -p ${STAGE_TEMP} make DESTDIR="${STAGE_TEMP}" install cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin - install -d ${STAGING_DIR}/${HOST_SYS}/share/gnome-common - cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common - cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal + install -d ${STAGING_DATADIR}/gnome-common + install -d ${STAGING_DATADIR}/aclocal + cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common + cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal rm -rf ${STAGE_TEMP} } diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb index 701ab1556d..e829ad39ca 100644 --- a/packages/gnome/libsoup_2.2.100.bb +++ b/packages/gnome/libsoup_2.2.100.bb @@ -8,9 +8,9 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" inherit autotools pkgconfig do_stage() { - rm -f ${PKG_CONFIG_PATH}/libsoup* + rm -f ${PKG_CONFIG_DIR}/libsoup* autotools_stage_all - ln -sf ${PKG_CONFIG_PATH}/libsoup.pc ${PKG_CONFIG_PATH}/libsoup-2.2.pc + ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc } FILES_${PN} = "${libdir}/lib*.so.*" |