2003-10-26 Lutz Mueller <lutz@users.sourceforge.net>

	* configure.in
	* Makefile.am: Remove PO_DIRS. Otherwise, automake complains about
	  po and intl not being in SUBDIRS

diff --git a/ChangeLog b/ChangeLog
index 22941d4..5a1747e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-10-26  Lutz Mueller <lutz@users.sourceforge.net>
 
+       * configure.in
+       * Makefile.am: Remove PO_DIRS. Otherwise, automake complains about
+         po and intl not being in SUBDIRS
+
+2003-10-26  Lutz Mueller <lutz@users.sourceforge.net>
+
        * libexif/olympus
        * libexif/canon
        * libexif/pentax: Merge libmnote with libexif. The code compiles but

diff --git a/Makefile.am b/Makefile.am
index 91b21e7..d6fb6ae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = libexif libjpeg test $(PO_DIR)
+SUBDIRS = libexif libjpeg test po intl
 
 EXTRA_DIST = @PACKAGE@.spec

diff --git a/configure.in b/configure.in
index 85edad8..c623f2b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -38,13 +38,10 @@ if test -f po/Makevars.template
 then
        sed -e "s/^DOMAIN.*/DOMAIN = ${GETTEXT_PACKAGE}/" < po/Makevars.template > po/Makevars
        AC_MSG_RESULT([yes. done.])
-       PO_DIR=po
 else
        AC_MSG_RESULT([no])
-       PO_DIR=
 fi
 AM_GNU_GETTEXT
-AC_SUBST([PO_DIR])
 
 dnl ---------------------------------------------------------------------------
 dnl Warnings
@@ -66,6 +63,7 @@ AC_OUTPUT([
   libjpeg/Makefile
   test/Makefile
   libexif/libexif.pc
+  po/Makefile.in
 ])
 
 echo "