From 0e0834b93ffbee1589e53e0bacee64d36adb4c59 Mon Sep 17 00:00:00 2001 From: Abou Al Montacir Date: Wed, 15 Jan 2014 21:49:04 +0100 Subject: [PATCH] Change path of localization fies to fit Debian standard. (Closes: Bug#73368) Gbp-Pq: Name change-path-of-localization-files-to-fit-Debian-standar.patch --- fpcsrc/utils/fpdoc/dglobals.pp | 4 ++-- fpcsrc/utils/fpdoc/fpclasschart.pp | 2 +- fpcsrc/utils/fpdoc/fpdoc.pp | 2 +- fpcsrc/utils/fpdoc/intl/Makefile | 12 +++++++----- fpcsrc/utils/fpdoc/makeskel.pp | 2 +- fpcsrc/utils/fpdoc/unitdiff.pp | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/fpcsrc/utils/fpdoc/dglobals.pp b/fpcsrc/utils/fpdoc/dglobals.pp index 1d43a975..a74672db 100644 --- a/fpcsrc/utils/fpdoc/dglobals.pp +++ b/fpcsrc/utils/fpdoc/dglobals.pp @@ -1677,7 +1677,7 @@ procedure TranslateDocStrings(const Lang: String); Const {$ifdef unix} - DefDir = '/usr/local/share/locale'; + DefDir = '/usr/share/locale'; {$else} DefDir = 'intl'; {$endif} @@ -1691,7 +1691,7 @@ begin Dir:=DefDir; Dir:=IncludeTrailingPathDelimiter(Dir); {$IFDEF Unix} - mo := TMOFile.Create(Format(Dir+'%s/LC_MESSAGES/dglobals.mo', [Lang])); + mo := TMOFile.Create(Format(Dir+'%s/LC_MESSAGES/dglobals-' + {$include %FPCVERSION%} + '.mo', [Lang])); {$ELSE} mo := TMOFile.Create(Format(Dir+'dglobals.%s.mo', [Lang])); {$ENDIF} diff --git a/fpcsrc/utils/fpdoc/fpclasschart.pp b/fpcsrc/utils/fpdoc/fpclasschart.pp index b70ebb4d..c966378c 100644 --- a/fpcsrc/utils/fpdoc/fpclasschart.pp +++ b/fpcsrc/utils/fpdoc/fpclasschart.pp @@ -687,7 +687,7 @@ Function ParseCommandLine : Integer; Const {$IFDEF Unix} - MoFileTemplate = '/usr/local/share/locale/%s/LC_MESSAGES/makeskel.mo'; + MoFileTemplate = '/usr/share/locale/%s/LC_MESSAGES/makeskel-' + {$include %FPCVERSION%} + '.mo'; {$ELSE} MoFileTemplate ='intl/makeskel.%s.mo'; {$ENDIF} diff --git a/fpcsrc/utils/fpdoc/fpdoc.pp b/fpcsrc/utils/fpdoc/fpdoc.pp index 999e31ef..01124472 100644 --- a/fpcsrc/utils/fpdoc/fpdoc.pp +++ b/fpcsrc/utils/fpdoc/fpdoc.pp @@ -394,7 +394,7 @@ Procedure TFPDocApplication.DoRun; begin try {$IFDEF Unix} - gettext.TranslateResourceStrings('/usr/local/share/locale/%s/LC_MESSAGES/fpdoc.mo'); + gettext.TranslateResourceStrings('/usr/share/locale/%s/LC_MESSAGES/fpdoc-' + {$include %FPCVERSION%} + '.mo'); {$ELSE} gettext.TranslateResourceStrings('intl/fpdoc.%s.mo'); {$ENDIF} diff --git a/fpcsrc/utils/fpdoc/intl/Makefile b/fpcsrc/utils/fpdoc/intl/Makefile index 0ad56eb3..a356d08b 100644 --- a/fpcsrc/utils/fpdoc/intl/Makefile +++ b/fpcsrc/utils/fpdoc/intl/Makefile @@ -1,3 +1,5 @@ +FPC_VERSION=$(shell ${PP} -iV) + all: de clean: @@ -16,8 +18,8 @@ pot: rstconv -i ../makeskel.rst -o makeskel.pot rstconv -i ../fpdocmk.rst -o fpdocmk.pot -install: - install -D -m 0644 fpdoc.de.mo /usr/local/share/locale/de/LC_MESSAGES/fpdoc.mo - install -D -m 0644 dglobals.de.mo /usr/local/share/locale/de/LC_MESSAGES/dglobals.mo - install -D -m 0644 makeskel.de.mo /usr/local/share/locale/de/LC_MESSAGES/makeskel.mo - install -D -m 0644 fpdocmk.de.mo /usr/local/share/locale/de/LC_MESSAGES/fpdocmk.mo +install: de + install -D -m 0644 fpdoc.de.mo ${INSTALL_PREFIX}/share/locale/de/LC_MESSAGES/fpdoc-${FPC_VERSION}.mo + install -D -m 0644 dglobals.de.mo ${INSTALL_PREFIX}/share/locale/de/LC_MESSAGES/dglobals-${FPC_VERSION}.mo + install -D -m 0644 makeskel.de.mo ${INSTALL_PREFIX}/share/locale/de/LC_MESSAGES/makeskel-${FPC_VERSION}.mo + install -D -m 0644 fpdocmk.de.mo ${INSTALL_PREFIX}/share/locale/de/LC_MESSAGES/fpdocmk-${FPC_VERSION}.mo diff --git a/fpcsrc/utils/fpdoc/makeskel.pp b/fpcsrc/utils/fpdoc/makeskel.pp index b4b717ab..6ba9e7e2 100644 --- a/fpcsrc/utils/fpdoc/makeskel.pp +++ b/fpcsrc/utils/fpdoc/makeskel.pp @@ -584,7 +584,7 @@ Function ParseCommandLine : Integer; Const {$IFDEF Unix} - MoFileTemplate = '/usr/local/share/locale/%s/LC_MESSAGES/makeskel.mo'; + MoFileTemplate = '/usr/share/locale/%s/LC_MESSAGES/makeskel-' + {$include %FPCVERSION%} + '.mo'; {$ELSE} MoFileTemplate ='intl/makeskel.%s.mo'; {$ENDIF} diff --git a/fpcsrc/utils/fpdoc/unitdiff.pp b/fpcsrc/utils/fpdoc/unitdiff.pp index a7259cb4..2514729f 100644 --- a/fpcsrc/utils/fpdoc/unitdiff.pp +++ b/fpcsrc/utils/fpdoc/unitdiff.pp @@ -169,7 +169,7 @@ procedure ParseCommandLine; Const {$IFDEF Unix} - MoFileTemplate = '/usr/local/share/locale/%s/LC_MESSAGES/makeskel.mo'; + MoFileTemplate = '/usr/share/locale/%s/LC_MESSAGES/makeskel-' + {$include %FPCVERSION%} + '.mo'; {$ELSE} MoFileTemplate ='intl/makeskel.%s.mo'; {$ENDIF} -- 2.30.2