summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-10-18 11:13:47 +0200
committerCarl Hetherington <cth@carlh.net>2024-10-19 14:24:09 +0200
commit2a59f8d15ba0c57055da4dfac89304601eebfe96 (patch)
treee2ee7070acb7962149191582094229f69efe143f
parentd63c7dbec6394bce4641ddd351da4beac3f186df (diff)
Fix installation of our extra fa_IR.mo on Linux.
-rwxr-xr-xdebian/rules4
-rw-r--r--src/wx/wscript4
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules
index eacc2cd93..e7dda59e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,8 @@ override_dh_auto_configure:
override_dh_auto_build:
./waf build
+extra_mo = debian/$(CDIST_PACKAGE)/usr/share/local/fa_IR/LC_MESSAGES/wxstd.mo
+
override_dh_auto_install:
./waf install --destdir=debian/$(CDIST_PACKAGE)
mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/de/LC_MESSAGES/
@@ -38,7 +40,7 @@ override_dh_auto_install:
mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/ru/LC_MESSAGES/
cp -a /usr/share/locale/ru/LC_MESSAGES/wxstd-$(CDIST_WX_VERSION).mo debian/$(CDIST_PACKAGE)/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo
mkdir -p debian/$(CDIST_PACKAGE)/usr/share/locale/fa/LC_MESSAGES/
- cp -a $(CDIST_DIRECTORY)/src/dcpomatic/build/deb/dcpomatic-*/build/src/wx/mo/fa_IR/wxstd.mo debian/$(CDIST_PACKAGE)/usr/share/locale/fa/LC_MESSAGES/dcpomatic2-wxstd.mo
+ @if [ -e $(extra_mo) ]; then mv $(extra_mo) debian/$(CDIST_PACKAGE)/usr/share/locale/fa/LC_MESSAGES/dcpomatic2-wxstd.mo; fi
cp -a $(CDIST_DIRECTORY)/src/openssl/apps/openssl debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_openssl
cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpverify debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_verify_cli
cp -a $(CDIST_DIRECTORY)/src/libdcp/build/tools/dcpkdm debian/$(CDIST_PACKAGE)/usr/bin/dcpomatic2_kdm_inspect
diff --git a/src/wx/wscript b/src/wx/wscript
index 9015c2de4..fce9e08dd 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -346,7 +346,9 @@ def build(bld):
i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)
# Extra wxWidgets .mo file (not installed by wxWidgets apparently) that contains some
# of our own translations
- bld(rule='msgfmt -c ${SRC} -o ${TGT}', source=bld.path.make_node(os.path.join('..', '..', 'wx-po', 'fa_IR.po')), target=bld.path.get_bld().make_node(os.path.join('mo', 'fa_IR', 'wxstd.mo')))
+ mo = os.path.join('mo', 'fa_IR', 'wxstd.mo')
+ bld(rule='msgfmt -c ${SRC} -o ${TGT}', source=bld.path.make_node(os.path.join('..', '..', 'wx-po', 'fa_IR.po')), target=bld.path.get_bld().make_node(mo))
+ bld.install_files(os.path.join('${PREFIX}', 'share', 'locale', 'fa_IR', 'LC_MESSAGES'), mo)
def pot(bld):
i18n.pot(os.path.join('src', 'wx'), sources + " editable_list.h content_widget.h", 'libdcpomatic-wx')