Sigh. A new attempt to fix the make install problem with recent gettext/auto* versions.

SVN revision: 9300

.cvsignore

@@ -1,22 +1,19 @@
-config.h*
-.icons
 Makefile
 Makefile.in
 aclocal.m4
-config.status
-config.log
 config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.rpath
+config.status
+config.sub
 configure
-econfig.h
-econfig.h.in
 stamp-h
 stamp-h.in
-confdefs.h
-config.sub
 ltconfig
 ltmain.sh
-config.guess
-cat-id-tbl.c
 enlightenment.pot
 enlightenment*.tar.gz
 ABOUT-NLS
@@ -24,3 +21,4 @@ m4
 autom4te*.cache
 CommitLog
 stamp-h1
+mkinstalldirs

ChangeLog

@@ -1,3 +1,7 @@
+2004-03-08  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* configure.in (AM_GNU_GETTEXT_VERSION): Bump to 0.14.1.
+
 2002-09-04  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* configure.in (AC_OUTPUT): Add intl/Makefile.

Makefile.am

@@ -1,10 +1,9 @@
-SUBDIRS = \
-        scripts \
+SUBDIRS = intl \
+	scripts \
 	dox \
 	eesh \
 	epp \
-        man \
-	intl \
+	man \
 	src \
 	po \
 	debian
@@ -27,3 +26,5 @@ FAQ \
 INSTALL \
 NEWS \
 README
+
+ACLOCAL_AMFLAGS = -I m4

configure.in

@@ -67,7 +67,7 @@ AC_CHECK_FUNCS(buckets_of_erogenous_nym)
 AC_CHECK_FUNCS(buttox)
 
 AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION(0.10.40)
+AM_GNU_GETTEXT_VERSION(0.14.1)
 
 AC_ARG_ENABLE(fsstd, [  --enable-fsstd          install files following FSSTD [default=no]], ,enable_fsstd=no)
 

po/.cvsignore

@@ -1,15 +1,11 @@
-.icons
 Makefile
 Makefile.in
 Makefile.in.in
-.deps
-.libs
 stamp-*
 *.gmo
 POTFILES
 cat-id-tbl.c
 enlightenment.pot
-Makevars
 Rules-quot
 boldquot.sed
 en@boldquot.header

po/ChangeLog

@@ -1,3 +1,7 @@
+2004-03-08  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.14.1.
+
 2003-07-08  gettextize  <bug-gnu-utils@gnu.org>
 
 	* Makefile.in.in: Upgrade to gettext-0.10.38.

po/Makevars

@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = The Enlightenment Team
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =

src/Makefile.am

@@ -85,7 +85,7 @@ enlightenment_SOURCES = \
 
 
 LDADD = \
-	@INTLLIBS@		\
+	@LIBINTL@		\
 	$(FNLIB_LIBS) 		\
 	$(TTF_LIBS) 		\
 	$(ESD_LIBS) 		\