summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2009-03-23 18:08:45 +0100
committerSimon Josefsson <simon@josefsson.org>2009-03-23 18:08:45 +0100
commit5a7ac2fd90d0ff3d8e1bb4abb4843ce531d301d8 (patch)
tree7716bdd744330c3782ef8ef2ebc0861531a61d17
parent8609fcac6dafc730ef27b76e4d6501dc4e84f857 (diff)
downloadgnutls-5a7ac2fd90d0ff3d8e1bb4abb4843ce531d301d8.tar.gz
Fix po paths.
-rw-r--r--Makefile.am4
-rw-r--r--cfg.mk4
-rw-r--r--configure.ac4
-rw-r--r--lib/Makefile.am4
-rw-r--r--lib/configure.ac4
5 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index e6f47b8820..59d8bf371d 100644
--- 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 dc76a1a07c..3c31d447ed 100644
--- 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 3e48b89fa5..7da8c6d0fe 100644
--- 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 4be39b632c..b03a83e469 100644
--- 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 f8230d50ba..bb2b169977 100644
--- 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