diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-09-06 10:33:32 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-16 13:30:23 +0100 |
| commit | 6c4d3f5a56494cf394a9a069ea543e287ce5d4fc (patch) | |
| tree | 04f473ce7dae4a27b4daa49872590257b23aee40 | |
| parent | e6706bf559503ba8bc430533efe7eef0405a13ec (diff) | |
| download | poky-6c4d3f5a56494cf394a9a069ea543e287ce5d4fc.tar.gz | |
abiword: be carefull with # comments ending with backslash
* next line after #foo \ is not parsed correctly!
* but http://bugzilla.pokylinux.org/show_bug.cgi?id=813 says NOTABUG, so be *very carefull*
(From OE-Core rev: e1cfe72e7d1e8c165aeec4e380788288fe80a244)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc | 5 | ||||
| -rw-r--r-- | meta-demoapps/recipes-gnome/abiword/abiword.inc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc index e3f6a9d2b9..ce537df7ff 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc +++ b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc | |||
| @@ -17,8 +17,6 @@ FILES_${PN} += " \ | |||
| 17 | ${datadir}/abiword-${SHRT_VER}/scripts \ | 17 | ${datadir}/abiword-${SHRT_VER}/scripts \ |
| 18 | ${datadir}/abiword-${SHRT_VER}/system.profile-en \ | 18 | ${datadir}/abiword-${SHRT_VER}/system.profile-en \ |
| 19 | ${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \ | 19 | ${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \ |
| 20 | # ${datadir}/abiword-${SHRT_VER}/templates/A4.awt \ | ||
| 21 | # ${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \ | ||
| 22 | ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ | 20 | ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ |
| 23 | ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ | 21 | ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ |
| 24 | ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \ | 22 | ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \ |
| @@ -29,6 +27,9 @@ FILES_${PN} += " \ | |||
| 29 | ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \ | 27 | ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \ |
| 30 | ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt " | 28 | ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt " |
| 31 | 29 | ||
| 30 | # ${datadir}/abiword-${SHRT_VER}/templates/A4.awt \ | ||
| 31 | # ${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \ | ||
| 32 | |||
| 32 | inherit autotools pkgconfig | 33 | inherit autotools pkgconfig |
| 33 | 34 | ||
| 34 | PARALLEL_MAKE = "" | 35 | PARALLEL_MAKE = "" |
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc index 5d7e3ce600..b1b0f67012 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword.inc +++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc | |||
| @@ -25,9 +25,10 @@ FILES_${PN} += " \ | |||
| 25 | ${datadir}/abiword-${SHRT_VER}/glade \ | 25 | ${datadir}/abiword-${SHRT_VER}/glade \ |
| 26 | ${datadir}/abiword-${SHRT_VER}/system.profile-en \ | 26 | ${datadir}/abiword-${SHRT_VER}/system.profile-en \ |
| 27 | ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \ | 27 | ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \ |
| 28 | " | ||
| 29 | |||
| 28 | # ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ | 30 | # ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ |
| 29 | # ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ | 31 | # ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ |
| 30 | " | ||
| 31 | 32 | ||
| 32 | inherit autotools pkgconfig | 33 | inherit autotools pkgconfig |
| 33 | 34 | ||
