FIX:build:Do not hold generated/autoupdated files in the svn|

Rename po/*.in to po/*.po.in. .po are generated from po.in,
then the .mo is generated from .po file, the same way
like working with build dir. Generated .po files are only
cleaned on distclean.

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1518 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/configure.in b/navit/configure.in
index f22e19f..96798f6 100644 (file)
--- a/navit/configure.in
+++ b/navit/configure.in
@@ -557,9 +557,9 @@ if test x$enable_nls = xyes; then
   if test "$XGETTEXT" != "" -a "$HAVEGETTEXT" != ""; then
      PO=""
      if test "$LINGUAS" = ""; then
-           ling=` (cd $srcdir/po; /bin/ls *.po) `
+           ling=` (cd $srcdir/po; /bin/ls *.po.in) `
           for l in $ling; do
-               lcode=`basename $l .po`
+               lcode=`basename $l .po.in`
                LINGUAS="$LINGUAS$lcode "
            done
     fi

diff --git a/navit/po/Makefile.am b/navit/po/Makefile.am
index bfac6ed..0e9a18c 100644 (file)
--- a/navit/po/Makefile.am
+++ b/navit/po/Makefile.am
@@ -27,12 +27,7 @@ SUFFIXES = .po .mo
 all: @MOFILES@
 
 @POFILES@: navit.pot
-       if test "$(top_srcdir)" != "$(top_builddir)"; then \
-               $(MSGMERGE) --no-fuzzy-matching --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@ navit.pot; \
-       else \
-               $(MSGMERGE) --no-fuzzy-matching --update --verbose $@ navit.pot; \
-        fi
-
+       $(MSGMERGE) --no-fuzzy-matching --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@.in navit.pot
 
 navit.pot: $(POTFILES)
         $(XGETTEXT) --default-domain=navit \
@@ -69,8 +64,6 @@ distclean-local:
                if test "$$n" -a "$$n" != "__DuMmY" ; then \
                        l=`basename $$n .mo`; \
                        rm -f ../locale/$$l/LC_MESSAGES/navit.mo; \
-                       if test "$(top_srcdir)" != "$(top_builddir)"; then \
-                               rm -f $$l.po; \
-                       fi;\
+                       rm -f $$l.po; \
                fi; \
        done

diff --git a/navit/po/bg.po b/navit/po/bg.po.in
similarity index 100%
rename from navit/po/bg.po
rename to navit/po/bg.po.in

diff --git a/navit/po/cs.po b/navit/po/cs.po.in
similarity index 100%
rename from navit/po/cs.po
rename to navit/po/cs.po.in

diff --git a/navit/po/da.po b/navit/po/da.po.in
similarity index 100%
rename from navit/po/da.po
rename to navit/po/da.po.in

diff --git a/navit/po/de.po b/navit/po/de.po.in
similarity index 100%
rename from navit/po/de.po
rename to navit/po/de.po.in

diff --git a/navit/po/en_GB.po b/navit/po/en_GB.po.in
similarity index 100%
rename from navit/po/en_GB.po
rename to navit/po/en_GB.po.in

diff --git a/navit/po/es.po b/navit/po/es.po.in
similarity index 100%
rename from navit/po/es.po
rename to navit/po/es.po.in

diff --git a/navit/po/fi.po b/navit/po/fi.po.in
similarity index 100%
rename from navit/po/fi.po
rename to navit/po/fi.po.in

diff --git a/navit/po/fr.po b/navit/po/fr.po.in
similarity index 100%
rename from navit/po/fr.po
rename to navit/po/fr.po.in

diff --git a/navit/po/he.po b/navit/po/he.po.in
similarity index 100%
rename from navit/po/he.po
rename to navit/po/he.po.in

diff --git a/navit/po/hu.po b/navit/po/hu.po.in
similarity index 100%
rename from navit/po/hu.po
rename to navit/po/hu.po.in

diff --git a/navit/po/it.po b/navit/po/it.po.in
similarity index 100%
rename from navit/po/it.po
rename to navit/po/it.po.in

diff --git a/navit/po/ja.po b/navit/po/ja.po.in
similarity index 100%
rename from navit/po/ja.po
rename to navit/po/ja.po.in

diff --git a/navit/po/nb.po b/navit/po/nb.po.in
similarity index 100%
rename from navit/po/nb.po
rename to navit/po/nb.po.in

diff --git a/navit/po/nl.po b/navit/po/nl.po.in
similarity index 100%
rename from navit/po/nl.po
rename to navit/po/nl.po.in

diff --git a/navit/po/pl.po b/navit/po/pl.po.in
similarity index 100%
rename from navit/po/pl.po
rename to navit/po/pl.po.in

diff --git a/navit/po/pt.po b/navit/po/pt.po.in
similarity index 100%
rename from navit/po/pt.po
rename to navit/po/pt.po.in

diff --git a/navit/po/pt_BR.po b/navit/po/pt_BR.po.in
similarity index 100%
rename from navit/po/pt_BR.po
rename to navit/po/pt_BR.po.in

diff --git a/navit/po/ro.po b/navit/po/ro.po.in
similarity index 100%
rename from navit/po/ro.po
rename to navit/po/ro.po.in

diff --git a/navit/po/ru.po b/navit/po/ru.po.in
similarity index 100%
rename from navit/po/ru.po
rename to navit/po/ru.po.in

diff --git a/navit/po/sk.po b/navit/po/sk.po.in
similarity index 100%
rename from navit/po/sk.po
rename to navit/po/sk.po.in

diff --git a/navit/po/sl.po b/navit/po/sl.po.in
similarity index 100%
rename from navit/po/sl.po
rename to navit/po/sl.po.in

diff --git a/navit/po/sv.po b/navit/po/sv.po.in
similarity index 100%
rename from navit/po/sv.po
rename to navit/po/sv.po.in

diff --git a/navit/po/te.po b/navit/po/te.po.in
similarity index 100%
rename from navit/po/te.po
rename to navit/po/te.po.in

diff --git a/navit/po/th.po b/navit/po/th.po.in
similarity index 100%
rename from navit/po/th.po
rename to navit/po/th.po.in

diff --git a/navit/po/tr.po b/navit/po/tr.po.in
similarity index 100%
rename from navit/po/tr.po
rename to navit/po/tr.po.in

diff --git a/navit/po/zh_HK.po b/navit/po/zh_HK.po.in
similarity index 100%
rename from navit/po/zh_HK.po
rename to navit/po/zh_HK.po.in