Starting to fix intltool problem, Danilo just roxx

diff --git a/Makefile.am b/Makefile.am
index 8c5766c..58d9352 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = compat compiled geometry keycodes keymap m4 po rules semantics symbols types docs
+SUBDIRS = compat compiled geometry keycodes keymap po rules semantics symbols types docs
 
 EXTRA_DIST= config.rpath  COPYING README mkinstalldirs \
        autogen.sh \
@@ -6,7 +6,7 @@ EXTRA_DIST= config.rpath  COPYING README mkinstalldirs \
        xkeyboard-config.spec.in \
        intltool-extract.in intltool-merge.in intltool-update.in
 
-ACLOCAL_AMFLAGS = -I m4
+dnl ACLOCAL_AMFLAGS = -I m4
 
 if CREATE_XKBCOMP_SYMLINK
 install-data-hook:

diff --git a/autogen.sh b/autogen.sh
index acd6604..254ad7d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -147,8 +147,6 @@ do
        else
          echo "Creating $dr/aclocal.m4 ..."
          test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-         echo "Running gettextize...  Ignore non-fatal messages."
-         echo "no" | gettextize --intl --force --copy
          echo "Making $dr/aclocal.m4 writable ..."
          test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
         fi
@@ -156,14 +154,12 @@ do
       if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
        echo "Creating $dr/aclocal.m4 ..."
        test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-       echo "Running gettextize...  Ignore non-fatal messages."
-       echo "no" | gettextize --intl --force --copy
        echo "Making $dr/aclocal.m4 writable ..."
        test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
       fi
       if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
         echo "Running intltoolize..."
-       intltoolize --copy --force --automake
+       intltoolize --copy --force
       fi
       if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
         echo "Running xml-i18n-toolize..."

diff --git a/configure.in b/configure.in
index 0c05016..e953e51 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -44,10 +44,7 @@ AM_GLIB_GNU_GETTEXT
 AC_SUBST(xkb_base)
 AC_SUBST(xkb_rules_symlink)
 
-AC_OUTPUT([ 
-po/Makefile.in
-m4/Makefile  
-intl/Makefile
+AC_OUTPUT([ po/Makefile
 Makefile
 compat/Makefile
 compiled/Makefile

diff --git a/po/Makefile.am b/po/Makefile.am
new file mode 100644 (file)
index 0000000..ffddb2a
--- /dev/null
+++ b/po/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = $(wildcard *.po)
+
+update-pot:
+       $(INTLTOOL_UPDATE) -p -g $(GETTEXT_PACKAGE)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 07da7ea..b04fd21 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1427,13 +1427,13 @@
       <configItem>
         <name>lt</name>
         <_shortDescription>Ltu</_shortDescription>
-        <_description>Lithuanian qwerty &quot;numeric&quot;</_description>
+        <_description>Lithuanian</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Standard</_description>
+            <_description>"Standard"</_description>
           </configItem>
         </variant>
         <variant>
@@ -1454,25 +1454,25 @@
         <variant>
           <configItem>
             <name>basic</name>
-            <_description>Latvian Basic (RALT) variant</_description>
+            <_description>Basic (RALT) variant</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>apostrophe</name>
-            <_description>Latvian Apostrophe (') variant</_description>
+            <_description>Apostrophe (') variant</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tilde</name>
-            <_description>Latvian Tilde (~) variant</_description>
+            <_description>Tilde (~) variant</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fkey</name>
-            <_description>Latvian F-letter (F) variant</_description>
+            <_description>F-letter (F) variant</_description>
           </configItem>
         </variant>
       </variantList>