Merge master.
[dcpomatic.git] / platform / windows / wscript
index c09a714ec6cc0cae66f10d893e0132bd0a2d9b1f..82ee5ac127110ee59b9f6f379a63536023cda462 100644 (file)
@@ -124,7 +124,7 @@ File "%cdist_deps%/bin/ffprobe.exe"
 File "%binaries%/src/wx/dcpomatic2-wx.dll"
 File "%binaries%/src/lib/dcpomatic2.dll"
 
-SetOutPath "$INSTDIR\\lib"
+SetOutPath "$INSTDIR\\lib\\pango\\1.8.0\\modules"
 File "%static_deps%/lib/pango/1.8.0/modules/pango-arabic-lang.dll"
 File "%static_deps%/lib/pango/1.8.0/modules/pango-basic-win32.dll"
 File "%static_deps%/lib/pango/1.8.0/modules/pango-indic-lang.dll"
@@ -172,6 +172,7 @@ WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o
 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe"
 WriteUninstaller "$INSTDIR\\Uninstall.exe"
 
+CreateDirectory "$INSTDIR\etc\pango"
 ReadEnvStr $0 COMSPEC
 SetOutPath "$INSTDIR"
 nsExec::ExecToLog '$0 /C bin\pango-querymodules.exe > etc\pango\pango.modules'