From: Abou Al Montacir <abou.almontacir@sfr.fr>
Date: Wed, 15 Jan 2014 20:49:04 +0000 (+0100)
Subject: Change path of localization fies to fit Debian standard. (Closes: Bug#73368)
X-Git-Tag: archive/raspbian/3.2.2+dfsg-20+rpi1^2^2~30
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd2bb91b98b41251b522cdc5fbfffa45d3b9f6ef;p=fpc.git

Change path of localization fies to fit Debian standard. (Closes: Bug#73368)

Bug-Debian: http://bugs.debian.org/73368


Gbp-Pq: Name change-path-of-localization-files-to-fit-Debian-standar.patch
---

diff --git a/fpcsrc/utils/fpdoc/dglobals.pp b/fpcsrc/utils/fpdoc/dglobals.pp
index 42de2ac1..82b867aa 100644
--- a/fpcsrc/utils/fpdoc/dglobals.pp
+++ b/fpcsrc/utils/fpdoc/dglobals.pp
@@ -1683,7 +1683,7 @@ procedure TranslateDocStrings(const Lang: String);
 
 Const
 {$ifdef unix}
-  DefDir = '/usr/local/share/locale';
+  DefDir = '/usr/share/locale';
 {$else}  
   DefDir = 'intl';
 {$endif}
@@ -1697,7 +1697,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 f08bf023..9a755841 100644
--- a/fpcsrc/utils/fpdoc/fpdoc.pp
+++ b/fpcsrc/utils/fpdoc/fpdoc.pp
@@ -397,7 +397,7 @@ begin
    ExceptionExitCode:=1;
   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 23c3daf2..05ad8b7e 100644
--- a/fpcsrc/utils/fpdoc/makeskel.pp
+++ b/fpcsrc/utils/fpdoc/makeskel.pp
@@ -585,7 +585,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 0497c39d..c712889a 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}