1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From: Abou Al Montacir <abou.almontacir@sfr.fr>
Date: Wed, 15 Jan 2014 21:49:04 +0100
Subject: Change path of localization fies to fit Debian standard. (Closes: Bug#73368)
Bug-Debian: http://bugs.debian.org/73368
diff --git a/fpcsrc/utils/fpdoc/dglobals.pp b/fpcsrc/utils/fpdoc/dglobals.pp
--- a/fpcsrc/utils/fpdoc/dglobals.pp
+++ b/fpcsrc/utils/fpdoc/dglobals.pp
@@ -1601,7 +1601,7 @@ procedure TranslateDocStrings(const Lang: String);
Const
{$ifdef unix}
- DefDir = '/usr/local/share/locale';
+ DefDir = '/usr/share/locale';
{$else}
DefDir = 'intl';
{$endif}
@@ -1634,7 +1634,7 @@
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
--- a/fpcsrc/utils/fpdoc/fpclasschart.pp
+++ b/fpcsrc/utils/fpdoc/fpclasschart.pp
@@ -786,7 +786,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
--- a/fpcsrc/utils/fpdoc/fpdoc.pp
+++ b/fpcsrc/utils/fpdoc/fpdoc.pp
@@ -347,7 +347,7 @@ Procedure TFPDocAplication.DoRun;
begin
{$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
--- a/fpcsrc/utils/fpdoc/intl/Makefile
+++ b/fpcsrc/utils/fpdoc/intl/Makefile
@@ -1,3 +1,5 @@ pot:
+FPC_VERSION=$(shell ${PP} -iV)
+
all: de
clean:
@@ -16,8 +16,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
--- a/fpcsrc/utils/fpdoc/makeskel.pp
+++ b/fpcsrc/utils/fpdoc/makeskel.pp
@@ -534,7 +534,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
--- a/fpcsrc/utils/fpdoc/unitdiff.pp
+++ b/fpcsrc/utils/fpdoc/unitdiff.pp
@@ -167,7 +167,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}
|
