Try to fix font paths.

cth103 · Nov 2, 2015 · b679478 · b679478
1 parent 9bf2cf3
commit b679478
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/fonts/LiberationSans-Bold.ttf b/fonts/LiberationSans-Bold.ttf
diff --git a/fonts/LiberationSans-Italic.ttf b/fonts/LiberationSans-Italic.ttf
diff --git a/fonts/LiberationSans-Regular.ttf b/fonts/LiberationSans-Regular.ttf
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
@@ -187,7 +187,9 @@ cp $ROOT/32/src/dcpomatic/graphics/kdm_email.png "$WORK/$resources"
 cp $ROOT/32/src/dcpomatic/graphics/servers.png "$WORK/$resources"
 cp $ROOT/32/src/dcpomatic/graphics/tms.png "$WORK/$resources"
 cp $ROOT/32/src/dcpomatic/graphics/keys.png "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/LiberationSans-Regular.ttf "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$WORK/$resources"
 cp $ROOT/32/src/dcpomatic/graphics/splash.png "$WORK/$resources"
 cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server_small.png "$WORK/$resources"
 

diff --git a/platform/windows/wscript b/platform/windows/wscript
@@ -216,7 +216,9 @@ File "%binaries%/src/wx/mo/pt_PT/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/pt_PT/dcpomatic2.mo"
 
 SetOutPath "$INSTDIR"
-File "%resources%/../../LiberationSans-Regular.ttf"
+File "%resources%/../../fonts/LiberationSans-Regular.ttf"
+File "%resources%/../../fonts/LiberationSans-Italic.ttf"
+File "%resources%/../../fonts/LiberationSans-Bold.ttf"
 File "%graphics%/splash.png"
 
 CreateDirectory "$INSTDIR\etc\pango"

diff --git a/wscript b/wscript
@@ -442,7 +442,9 @@ def build(bld):
         bld.recurse('platform/osx')
 
     if not bld.env.TARGET_WINDOWS:
-        bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Regular.ttf')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Italic.ttf')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Bold.ttf')
 
     bld.add_post_fun(post)