diff options
author | Matthias Hentges <oe@hentges.net> | 2007-06-09 21:54:47 +0000 |
---|---|---|
committer | Matthias Hentges <oe@hentges.net> | 2007-06-09 21:54:47 +0000 |
commit | cc478760ffe73da7d2048c9d3a1f530544b4ebe1 (patch) | |
tree | bcac43fb846e5b17892f3762d3994bc595b46d0a /packages/fbreader | |
parent | 6c926c2feb610fda34a3c9bce2cc417f8fd6a175 (diff) | |
parent | 609871ae041cac81dbab5ebcd43520634f627dd2 (diff) |
merge of '7bc7d5c3532bb5efc024410e9d74cc23ebeb80c4'
and 'adf85b1ec40339e44983ef65acf414d9ad5ed6a4'
Diffstat (limited to 'packages/fbreader')
-rw-r--r-- | packages/fbreader/fbreader_0.8.2a.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb index b21aa7f930..3a0dc543e8 100644 --- a/packages/fbreader/fbreader_0.8.2a.bb +++ b/packages/fbreader/fbreader_0.8.2a.bb @@ -8,7 +8,7 @@ PR = "r3" # The RESOLUTION is defined at compile time which makes # this package MACHINE specific. -PACKAGE_ARCH_${PN} = "${MACHINE}" +PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \ file://fbreader-0.8.2a_buildsys_oe.patch;patch=1 \ @@ -21,11 +21,11 @@ READER_GUI = "gpe" READER_STATUS = "release" # Set device specific overrides -RESOLUTION_fic-gta01 = "480x640" +READER_RESOLUTION_fic-gta01 = "480x640" FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary" -CFLAGS_append = " RESOLUTION=${RESOLUTION} INSTALLDIR=/usr" +CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr" EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'" inherit pkgconfig @@ -45,6 +45,6 @@ do_configure() { } do_install () { - cd fbreader/${READER_ARCH}; oe_runmake .builddir RESOLUTION=${RESOLUTION} + cd fbreader/${READER_ARCH}; oe_runmake .builddir RESOLUTION=${READER_RESOLUTION} cp -r data/* ${D} } |