summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdinaldo P. Silva <edps.mundognu@gmail.com>2016-11-13 23:02:52 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-11-14 16:59:30 +0700
commitc7d5a57ce335b17c95371b3356f71a731be1e80d (patch)
treef2e734e6d6d8019a69cdc31625e0751039b27a0f
parenta551fa5850a6745b938c2a891fe92982b0d8d03a (diff)
downloadslackbuilds-c7d5a57ce335b17c95371b3356f71a731be1e80d.tar.gz
system/cantarell-fonts: Fixed SlackBuild.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--system/cantarell-fonts/cantarell-fonts.SlackBuild12
1 files changed, 6 insertions, 6 deletions
diff --git a/system/cantarell-fonts/cantarell-fonts.SlackBuild b/system/cantarell-fonts/cantarell-fonts.SlackBuild
index c154435e00..4db4adb1e9 100644
--- a/system/cantarell-fonts/cantarell-fonts.SlackBuild
+++ b/system/cantarell-fonts/cantarell-fonts.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for cantarell-fonts.
#
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil
+# Copyright 2015-2016 Edinaldo P. Silva, Rio de Janeiro, Brazil
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=cantarell-fonts
VERSION=${VERSION:-0.0.25}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
ARCH=noarch
@@ -58,6 +58,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
+ --with-configdir=/etc/fonts/conf.avail \
--build=$ARCH-slackware-linux
make
@@ -66,12 +67,11 @@ make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-mkdir -p $PKG/usr/share/fonts/OTF
-cp -a $PKG/usr/share/fonts/cantarell/*.otf $PKG/usr/share/fonts/OTF/
-rm -rf $PKG/usr/share/fonts/cantarell
+mkdir -p $PKG/etc/fonts/conf.d
+ln -srt $PKG/etc/fonts/conf.d $PKG/etc/fonts/conf.avail/*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install