diff --git a/packages/x11/font/encodings/build b/packages/x11/font/encodings/build index ce02987a1d..917223e719 100755 --- a/packages/x11/font/encodings/build +++ b/packages/x11/font/encodings/build @@ -28,7 +28,8 @@ cd $PKG_BUILD --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-gzip-small-encodings \ - --disable-gzip-large-encodings \ - --with-encodingsdir=$XORG_PATH_ENCODINGS -$MAKE + --enable-gzip-small-encodings \ + --enable-gzip-large-encodings \ + --with-fontrootdir=/usr/share/fonts + +make diff --git a/packages/x11/font/encodings/install b/packages/x11/font/encodings/install index 93071b189b..03864e4682 100755 --- a/packages/x11/font/encodings/install +++ b/packages/x11/font/encodings/install @@ -22,8 +22,12 @@ . config/options $1 -mkdir -p $INSTALL/$XORG_PATH_ENCODINGS - cp $PKG_BUILD/*.enc $INSTALL/$XORG_PATH_ENCODINGS +FONTDIR="$INSTALL/usr/share/fonts" -mkdir -p $INSTALL/$XORG_PATH_ENCODINGS/large - cp $PKG_BUILD/large/*.enc $INSTALL/$XORG_PATH_ENCODINGS/large +mkdir -p $FONTDIR/encodings + cp $PKG_BUILD/*.enc.gz $FONTDIR/encodings + cp $PKG_BUILD/encodings.dir $FONTDIR/encodings + +mkdir -p $FONTDIR/encodings/large + cp $PKG_BUILD/large/*.enc.gz $FONTDIR/encodings/large + cp $PKG_BUILD/large/encodings.dir $FONTDIR/encodings/large diff --git a/packages/x11/font/encodings/meta b/packages/x11/font/encodings/meta index 02a3869541..d2fdb1c340 100644 --- a/packages/x11/font/encodings/meta +++ b/packages/x11/font/encodings/meta @@ -26,7 +26,7 @@ PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain util-macros" +PKG_BUILD_DEPENDS="toolchain util-macros font-util-host" PKG_PRIORITY="optional" PKG_SECTION="x11/font" PKG_SHORTDESC="encodings: X font encodings"