Fix po paths.

diff --git a/Makefile.am b/Makefile.am
index e6f47b88207f1c4e9b6b4728b43935d59ff684cd..59d8bf371d70b112e38253215e98f41ed89b6800 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-#               2006, 2007, 2008 Free Software Foundation
+#               2006, 2007, 2008, 2009 Free Software Foundation
 #
 # Author: Nikos Mavrogiannopoulos
 #
@@ -22,7 +22,7 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-SUBDIRS = lib libextra gl src doc tests
+SUBDIRS = lib libextra gl po src doc tests
 
 if HAVE_GUILE
 SUBDIRS += guile

diff --git a/cfg.mk b/cfg.mk
index dc76a1a07cdd9e36339974280808ece84e363007..3c31d447ed974d80d793b589c2b64fad577a67ec 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -26,7 +26,7 @@ ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
 .DEFAULT_GOAL := bootstrap
 endif
 
-PODIR := lib/po
+PODIR := po
 
 autoreconf:
        for f in $(PODIR)/*.po.in; do \

diff --git a/configure.ac b/configure.ac
index 3e48b89fa55486377e0811f7658879170c3dd90f..7da8c6d0fe383a43eafa3b363d003ac135c97e39 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,9 @@ fi
 gl_EARLY
 AC_C_INLINE
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 AC_ARG_ENABLE(cxx,
   AS_HELP_STRING([--disable-cxx], [unconditionally disable the C++ library]),
     use_cxx=$enableval, use_cxx=yes)
@@ -244,6 +247,7 @@ AC_CONFIG_FILES([
   guile/modules/Makefile
   guile/src/Makefile
   guile/tests/Makefile
+  po/Makefile.in
   src/Makefile
   src/cfg/Makefile
   src/cfg/platon/Makefile

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4be39b632c243c442e26b8a6e4ea0ec402fb9bdb..b03a83e469026f72d863a22865e699aa0d4df010 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
 #
 # Author: Nikos Mavrogiannopoulos
 #
@@ -22,7 +22,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 
-SUBDIRS = gl includes po x509
+SUBDIRS = gl includes x509
 if ENABLE_MINITASN1
 SUBDIRS += minitasn1
 endif

diff --git a/lib/configure.ac b/lib/configure.ac
index f8230d50ba02f23409fad4442ffe13a3fe2e5cc3..bb2b169977779a536dbfff69c12ed77e15229949 100644 (file)
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -32,9 +32,6 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 lgl_EARLY
 
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
-
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
@@ -105,7 +102,6 @@ AC_CONFIG_FILES([
   minitasn1/Makefile
   opencdk/Makefile
   openpgp/Makefile
-  po/Makefile.in
   x509/Makefile
 ])
 AC_OUTPUT