aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Robbins <contact@andrewrobbins.info>2018-12-10 23:00:57 -0500
committerAndrew Robbins <contact@andrewrobbins.info>2018-12-10 23:55:39 -0500
commitc61b2d58889b6b02f838f11c85ec5cebf362b828 (patch)
tree67bc24ec0d453c0e039bc52d8f067680292e4ff7
parentb84efc5b838c48c2f36de9424ec103ed7f551e71 (diff)
downloadlibrebootfr-c61b2d58889b6b02f838f11c85ec5cebf362b828.tar.gz
librebootfr-c61b2d58889b6b02f838f11c85ec5cebf362b828.zip
Link fontconfig orthography files in dejavu build
The path contained in the symlink has been made relative for reproducibility reasons. Also, it just makes more sense to create the symlink during the download() action vs. build(). The `-f` flag was added to avoid an error if the link already exists (i.e., download() has been executed previously).
-rwxr-xr-xprojects/dejavu-fonts/dejavu-fonts7
1 files changed, 3 insertions, 4 deletions
diff --git a/projects/dejavu-fonts/dejavu-fonts b/projects/dejavu-fonts/dejavu-fonts
index 2c5f518b..d380235f 100755
--- a/projects/dejavu-fonts/dejavu-fonts
+++ b/projects/dejavu-fonts/dejavu-fonts
@@ -40,8 +40,10 @@ download() {
done
project_download_git "$project" "$repository" https://github.com/dejavu-fonts/dejavu-fonts.git "$@"
-
download_wrapper "$sources_path/resources" "${download_list[@]}"
+
+ # Create a symlink to fontconfig's orthography files
+ ln -fs ../../fontconfig/fc-lang "$sources_path/resources/fc-lang"
}
download_check() {
@@ -88,9 +90,6 @@ build() {
mkdir -p "$build_path"
- # Create a symlink to the orthography files provided by fontconfig
- ln -s "$root/$SOURCES/fontconfig/fc-lang" "$sources_path/resources/fc-lang"
-
make -C "$sources_path" -j"$TASKS"
cp "$sources_path/build"/[!.]*.ttf "$build_path"
make -C "$sources_path" clean