anchor.diff:      autotools_do_configure
   }
   
  -FILES_${PN} 			+= "${libdir}/libabiword-*.so ${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/certs ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml"
  -FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/strings"
  -FILES_abiword-systemprofiles    += "${datadir}/abiword-${SHRT_VER}/system.profile*"
  +do_install_append() {
  +        install -d ${D}${datadir}/pixmaps/
  +        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
  +        rmdir ${D}${datadir}/icons
  +}
   
  -PACKAGES_DYNAMIC = "abiword-meta abiword-plugin-*"
  +PACKAGES += " ${PN}-clipart ${PN}-icons ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
  +
  +FILES_${PN} += " \
  +                ${libdir}/lib${PN}-*.so \
  +                ${datadir}/mime-info \
  +                ${datadir}/icons/* \
  +                ${datadir}/${PN}-${SHRT_VER}/glade \
  +                ${datadir}/${PN}-${SHRT_VER}/scripts \
  +                ${datadir}/${PN}-${SHRT_VER}/system.profile-en \
  +                ${datadir}/${PN}-${SHRT_VER}/system.profile-en_GB \
  +                ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt \
  +                ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt-en_GB \
  +                ${datadir}/${PN}-${SHRT_VER}/templates/Employee-Directory.awt \
  +                ${datadir}/${PN}-${SHRT_VER}/templates/Business-Report.awt \
  +                ${datadir}/${PN}-${SHRT_VER}/templates/Fax-Coversheet.awt \
  +                ${datadir}/${PN}-${SHRT_VER}/templates/Resume.awt \
  +                ${datadir}/${PN}-${SHRT_VER}/templates/Two-Columns.awt \
  +                ${datadir}/${PN}-${SHRT_VER}/templates/Memo.awt \
  +                ${datadir}/${PN}-${SHRT_VER}/templates/Press-Release.awt \
  +                ${datadir}/${PN}-${SHRT_VER}/certs \
  +                ${datadir}/${PN}-${SHRT_VER}/ui \
  +                ${datadir}/${PN}-${SHRT_VER}/xsl* \ 
  +                ${datadir}/${PN}-${SHRT_VER}/mime-info \
  +                ${datadir}/${PN}-${SHRT_VER}/Pr*.xml \
  +"
  +
  +# don't steal /usr/lib/libabiword-2.8.so from ${PN}
  +# in this case it's needed in ${PN}
  +FILES_${PN}-dev = " \
  +                  ${includedir} \
  +                  ${libdir}/pkgconfig \
  +                  ${libdir}/${PN}*.la \
  +                  ${libdir}/lib${PN}*.la \
  +                  ${libdir}/${PN}-${SHRT_VER}/plugins/*.la \
  +"
  +FILES_${PN}-dbg += "${libdir}/${PN}-${SHRT_VER}/plugins/.debug"
  +FILES_${PN}-doc += "${datadir}/${PN}-*/readme*"
  +
  +FILES_${PN}-strings        += "${datadir}/${PN}-${SHRT_VER}/strings"
  +FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*"
  +FILES_${PN}-clipart        += "${datadir}/${PN}-${SHRT_VER}/clipart"
  +FILES_${PN}-icons          += "${datadir}/${PN}-${SHRT_VER}/icons"
  +FILES_${PN}-strings        += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings"
  +FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*"
  +FILES_${PN}-templates      += "${datadir}/${PN}-${SHRT_VER}/templates"
  +
  +PACKAGES_DYNAMIC = "${PN}-meta ${PN}-plugin-*"
   
   python populate_packages_prepend () {
   	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.8/plugins', d)
  
positive.code: SECTION = "x11/office"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
  DEPENDS     = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
  RDEPENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
                 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
  
  SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
             file://fix.double.install.patch \
  "
  SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
  SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
  
  #want 2.x from 2.x.y for the installation directory
  SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
  
  FILES_${PN} += " \
  		${datadir}/icons/* \
  		${datadir}/abiword-${SHRT_VER}/glade \
  		${datadir}/abiword-${SHRT_VER}/scripts \
  		${datadir}/abiword-${SHRT_VER}/system.profile-en \
  		${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
  		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
  		${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
  		${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
  		${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
  		${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
  		${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
  		${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
  		${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
  		${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
  
  inherit autotools pkgconfig
  
  PARALLEL_MAKE = ""
  
  EXTRA_OECONF = " --disable-pspell \
                   --disable-spellcheck \
  		 --disable-printing \
  		 --disable-exports \
  		 --with-sys-wv"
  
  # AbiWord configure.ac does not play nicely with autoreconf
  # so use the autogen.sh script that comes with AbiWord
  #
  do_configure() {
          cd ${S}
          export NOCONFIGURE="no"; ./autogen.sh
          oe_runconf
  }
  
  
  do_install_append() {
          install -d ${D}${datadir}/pixmaps/
          mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
          rmdir ${D}${datadir}/icons
  }
  
  PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
  
  FILES_abiword-clipart 		+= "${datadir}/abiword-${SHRT_VER}/clipart"
  FILES_abiword-icons 		+= "${datadir}/abiword-${SHRT_VER}/icons"
  FILES_abiword-strings 		+= "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
  FILES_abiword-systemprofiles 	+= "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
  FILES_abiword-templates 	+= "${datadir}/abiword-${SHRT_VER}/templates"
  
  DEPENDS += " librsvg loudmouth libwmf-native gtkmathview asio"
  RCONFLICTS_${PN} = "abiword-embedded"
  
  PR = "r4"
  
  SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \
             file://autogen-common.sh \
             file://nodolt.patch \
             file://fix.no.undefined.param.patch \
  
negative.code:                  --with-libwmf-config=${STAGING_DIR} \
  "
  
  # AbiWord configure.ac does not play nicely with autoreconf
  # so use the autogen.sh script that comes with AbiWord
  do_configure() {
      install -m 0755 ${WORKDIR}/autogen-common.sh ${S}/autogen-common.sh
      cd ${S}
  