Commit 2d5e5d83 authored by Florent Revest's avatar Florent Revest

ttf-opensans: use Qt fonts directory variable to solve incorrect directory issues we had until now

parent 367dd813
...@@ -7,7 +7,8 @@ PR = "r0" ...@@ -7,7 +7,8 @@ PR = "r0"
# we don't need a compiler nor a c library for these fonts # we don't need a compiler nor a c library for these fonts
INHIBIT_DEFAULT_DEPS = "1" INHIBIT_DEFAULT_DEPS = "1"
inherit allarch fontcache inherit allarch
inherit qmake5_paths
SRC_URI = "git://github.com/ppowalowski/fontface-open-sans.git;protocol=https" SRC_URI = "git://github.com/ppowalowski/fontface-open-sans.git;protocol=https"
SRCREV = "462165fa0e73a665d2fbc8c80ecc23ce135700da" SRCREV = "462165fa0e73a665d2fbc8c80ecc23ce135700da"
...@@ -17,11 +18,8 @@ FONT_PACKAGES = "ttf-opensans" ...@@ -17,11 +18,8 @@ FONT_PACKAGES = "ttf-opensans"
do_install() { do_install() {
# Different versions of OE seems to require different places for fonts so we install in both share and lib... # Different versions of OE seems to require different places for fonts so we install in both share and lib...
install -d ${D}/usr/share/fonts/ install -d ${D}/${OE_QMAKE_PATH_QT_FONTS}
find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/usr/share/fonts/ \; find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/${OE_QMAKE_PATH_QT_FONTS} \;
install -d ${D}/usr/lib/fonts/
find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/usr/lib/fonts/ \;
} }
FILES_${PN} += "/usr/share/fonts/ /usr/lib/fonts/" FILES_${PN} += "${OE_QMAKE_PATH_QT_FONTS}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment