X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fpkg%2Ffontconfig;h=44efe3415ddf9c0c74b176f8d31f4b36abcc73de;hb=23534737a153c4084e3dd44a3e6cdcf2537aee01;hp=e3ff347c4cf48730de0bb9861a667fff446254a4;hpb=9e3f8101a7e4d974db8e9afeb9c90c13a43ae8d7;p=hvlinux.git diff --git a/stage3/pkg/fontconfig b/stage3/pkg/fontconfig index e3ff347..44efe34 100644 --- a/stage3/pkg/fontconfig +++ b/stage3/pkg/fontconfig @@ -2,13 +2,7 @@ hvconfig_pre() { - if [ -z "${HV_FONTS_PATH}" ]; then - echo "Missing HV_FONTS_PATH environment variable" - exit 1 - fi - - CONFIGURE_OPTS="\ - ${CONFIGURE_OPTS} \ + CONFIGURE_OPTS+=" \ --localstatedir=/var \ --disable-docs \ --without-add-fonts \ @@ -17,26 +11,6 @@ hvconfig_pre() hvbuild_post() { - mkdir -v -p ${HV_FONTS_PATH}/{TrueType,Type1} - mkdir -v -p /etc/fonts - - if [ -f /etc/fonts/local.conf ]; then - mv -v /etc/fonts/local.conf /etc/fonts/local.conf.old - fi - - # Adding X and our local fonts directory to local configuration file - cat > /etc/fonts/local.conf << "EOF" - - - - - _HV_FONTS_PATH_/TrueType - _HV_FONTS_PATH_/Type1 - -EOF - - sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/fonts/local.conf - - # Updating cache database. + # Updating font information cache. fc-cache -f }