summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-06-22 10:51:46 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-06-22 10:51:46 +0000
commitdc883aa96eff5fb7c441197bcaacecb5c221bc5c (patch)
tree893d14d8a961d478974ff39f697365155e9a2c54
parente40ffa1c11047ad5e9c74b2c91db95b0cbf05ee6 (diff)
also fix the fontconfig docbook2man issue
BKrev: 40d80f42Fi0b6mWXiKlQI3A6nGh4lA
-rw-r--r--fontconfig/fontconfig-native_2.2.94.oe8
-rw-r--r--fontconfig/fontconfig_2.2.94.oe2
2 files changed, 2 insertions, 8 deletions
diff --git a/fontconfig/fontconfig-native_2.2.94.oe b/fontconfig/fontconfig-native_2.2.94.oe
index 2c5a8a9651..941f573622 100644
--- a/fontconfig/fontconfig-native_2.2.94.oe
+++ b/fontconfig/fontconfig-native_2.2.94.oe
@@ -3,16 +3,8 @@ inherit native
DEPENDS = "freetype-native expat-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/fontconfig-${PV}"
-export HASDOCBOOK="no"
-
do_stage () {
oe_runmake install
install fc-lang/fc-lang ${STAGING_BINDIR}
install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
}
-
-#
-# FIXME: If this package fails to compile on your host, then
-# you have docbook2html installed. Delete it or fix this package
-# to obey what we request in fontconfig (--disable-docs).
-#
diff --git a/fontconfig/fontconfig_2.2.94.oe b/fontconfig/fontconfig_2.2.94.oe
index e7dc83aea8..6a35855e17 100644
--- a/fontconfig/fontconfig_2.2.94.oe
+++ b/fontconfig/fontconfig_2.2.94.oe
@@ -13,6 +13,8 @@ S = "${WORKDIR}/fontconfig-${PV}"
inherit autotools pkgconfig
+export HASDOCBOOK="no"
+
EXTRA_OECONF = " --disable-docs "
do_compile () {