* autogen.sh: Restore original autoreconf (see 2010-08-29's change

	for autogen.sh)
	* configure.in, man/po/Makefile.in.in, man/po/Makefile.in:
	Makefile.in.in replaced by Makefile.in to avoid config.status
	issues when there are multiple po directories.
	* man/po/LINGUAS: Adapted to above change.
	* man/po/POTFILES.in, man/po/XMLFILES: POTFILES.in replaced by
	XMLFILES.
	* man/Makefile.am: generate_mans.deps shall be included by make,
	not automake.

ChangeLog

@@ -1,3 +1,16 @@
+2011-02-12 Nicolas François <[email protected]>
+
+ * autogen.sh: Restore original autoreconf (see 2010-08-29's change
+ for autogen.sh)
+ * configure.in, man/po/Makefile.in.in, man/po/Makefile.in:
+ Makefile.in.in replaced by Makefile.in to avoid config.status
+ issues when there are multiple po directories.
+ * man/po/LINGUAS: Adapted to above change.
+ * man/po/POTFILES.in, man/po/XMLFILES: POTFILES.in replaced by
+ XMLFILES.
+ * man/Makefile.am: generate_mans.deps shall be included by make,
+ not automake.
+
 2010-11-19 Nicolas François <[email protected]>
 
  * NEWS, libmisc/console.c: Fix CONSOLE parser. This caused login

autogen.sh

@@ -1,16 +1,6 @@
 #! /bin/sh
 
-# FIXME: Find a way to run autoreconf again.
-# autopoint create mess in man/po
-#autoreconf -v -f --install || exit 1
-
-#autoreconf executes the following
-#autopoint --force
-aclocal --force 
-libtoolize --copy --force
-/usr/bin/autoconf --force
-/usr/bin/autoheader --force
-automake --add-missing --copy --force-missing
+autoreconf -v -f --install || exit 1
 
 ./configure \
  CFLAGS="-O2 -Wall" \

configure.in

@@ -586,7 +586,7 @@ AC_CONFIG_FILES([
  doc/Makefile
  man/Makefile
  man/config.xml
- man/po/Makefile.in
+ man/po/Makefile
  man/cs/Makefile
  man/de/Makefile
  man/es/Makefile

man/Makefile.am

@@ -180,7 +180,7 @@ generate_mans.deps: *.xml
 
 if ENABLE_REGENERATE_MAN
 
-include generate_mans.deps
+@ENABLE_REGENERATE_MAN_TRUE@include generate_mans.deps
 
 include generate_mans.mak
 

man/po/LINGUAS

@@ -1,6 +1,4 @@
-de
-fr
-it
-pl
-ru
-sv
+LINGUAS = de fr it pl ru sv
+POFILES = $(srcdir)/de.po $(srcdir)/fr.po $(srcdir)/it.po $(srcdir)/pl.po $(srcdir)/ru.po $(srcdir)/sv.po
+UPDATEPOFILES = de.po-update fr.po-update it.po-update pl.po-update ru.po-update sv.po-update
+DUMMYPOFILES = de.nop fr.nop it.nop pl.nop ru.nop sv.nop

man/po/Makefile.in.in → man/po/Makefile.in

@@ -11,40 +11,39 @@
 # Origin: gettext-0.16
 # Modified to handle translations with xml2po by Nicolas François - 2007
 
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE = shadow
+VERSION = 4.1.4.2+svn3283
+PACKAGE_BUGREPORT = 
 
 SHELL = /bin/sh
-@SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
 
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
+srcdir = .
+top_srcdir = ../..
+
+
+MSGFMT_ = /usr/bin/msgfmt
+MSGFMT_no = /usr/bin/msgfmt
+MSGFMT_yes = /usr/bin/msgfmt
 MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-XGETTEXT_ = @XGETTEXT@
-XGETTEXT_no = @XGETTEXT@
-XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT_ = /usr/bin/xgettext
+XGETTEXT_no = /usr/bin/xgettext
+XGETTEXT_yes = /usr/bin/xgettext
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge --previous
-MSGMERGE_UPDATE = @MSGMERGE@ --update --previous
+MSGMERGE_UPDATE = /usr/bin/msgmerge --update --previous
 MSGINIT = msginit
 MSGCONV = msgconv
 MSGFILTER = msgfilter
 
-POFILES = @POFILES@
-UPDATEPOFILES = @UPDATEPOFILES@
-DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in remove-potcdate.sin
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(POFILES)
+include $(srcdir)/LINGUAS
+#DISTFILES.common = Makefile.in remove-potcdate.sin
+DISTFILES.common = remove-potcdate.sin
+DISTFILES = $(DISTFILES.common) Makevars XMLFILES LINGUAS $(POFILES)
 
-POTFILES = \
+include $(srcdir)/XMLFILES
 
-# Makevars gets inserted here. (Don't remove this line!)
+include $(srcdir)/Makevars
 
 .SUFFIXES:
 .SUFFIXES: .po .sed .sin .nop .po-create .po-update
@@ -57,7 +56,7 @@ remove-potcdate.sin: ../../po/remove-potcdate.sin
  mv t-$@ $@
 
 
-all: all-@USE_NLS@
+all: all-yes
 
 all-yes: stamp-po
 all-no:
@@ -90,12 +89,12 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
 # TODO: set MSGID_BUGS_ADDRESS, COPYRIGHT_HOLDER
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+$(DOMAIN).pot-update: $(XMLFILES) $(srcdir)/XMLFILES remove-potcdate.sed
  @set -e; tmpdir=`pwd`; \
  echo "cd $(top_srcdir)/man"; \
  cd $(top_srcdir)/man; \
- echo "xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES))"; \
- xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES)); \
+ echo "xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(XMLFILES))"; \
+ xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(XMLFILES)); \
  cd $$tmpdir
  test ! -f $(DOMAIN).po || { \
  if test -f $(srcdir)/$(DOMAIN).pot; then \
@@ -160,7 +159,7 @@ mostlyclean:
 clean: mostlyclean
 
 distclean: clean
- rm -f Makefile Makefile.in POTFILES
+ rm -f Makefile
 
 maintainer-clean: distclean
  @echo "This command is intended for maintainers to use;"
@@ -185,14 +184,15 @@ dist2: stamp-po $(DISTFILES)
  dists="$$dists ChangeLog.$$i"; \
  fi; \
  done; \
- if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
  for file in $$dists; do \
  if test -f $$file; then \
  cp -p $$file $(distdir) || exit 1; \
  else \
  cp -p $(srcdir)/$$file $(distdir) || exit 1; \
  fi; \
  done
+# avant for precedant
+# if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
 
 update-po: Makefile
  $(MAKE) $(DOMAIN).pot-update
@@ -232,9 +232,9 @@ update-po: Makefile
 
 $(DUMMYPOFILES):
 
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
- cd $(top_builddir) \
- && $(SHELL) ./config.status $(subdir)/$@.in po-directories
+#Makefile: Makefile.in Makevars $(top_builddir)/config.status LINGUAS
+# cd $(top_builddir) \
+# && $(SHELL) ./config.status $(subdir)/$@
 
 force:
 

man/po/XMLFILES

@@ -0,0 +1,42 @@
+# List of xml which contain translatable strings.
+XMLFILES = \
+ $(top_srcdir)/man/chage.1.xml \
+ $(top_srcdir)/man/chfn.1.xml \
+ $(top_srcdir)/man/chgpasswd.8.xml \
+ $(top_srcdir)/man/chpasswd.8.xml \
+ $(top_srcdir)/man/chsh.1.xml \
+ $(top_srcdir)/man/expiry.1.xml \
+ $(top_srcdir)/man/faillog.5.xml \
+ $(top_srcdir)/man/faillog.8.xml \
+ $(top_srcdir)/man/gpasswd.1.xml \
+ $(top_srcdir)/man/groupadd.8.xml \
+ $(top_srcdir)/man/groupdel.8.xml \
+ $(top_srcdir)/man/groupmems.8.xml \
+ $(top_srcdir)/man/groupmod.8.xml \
+ $(top_srcdir)/man/groups.1.xml \
+ $(top_srcdir)/man/grpck.8.xml \
+ $(top_srcdir)/man/gshadow.5.xml \
+ $(top_srcdir)/man/lastlog.8.xml \
+ $(top_srcdir)/man/limits.5.xml \
+ $(top_srcdir)/man/login.1.xml \
+ $(top_srcdir)/man/login.access.5.xml \
+ $(top_srcdir)/man/login.defs.5.xml \
+ $(top_srcdir)/man/logoutd.8.xml \
+ $(top_srcdir)/man/newgrp.1.xml \
+ $(top_srcdir)/man/newusers.8.xml \
+ $(top_srcdir)/man/nologin.8.xml \
+ $(top_srcdir)/man/passwd.1.xml \
+ $(top_srcdir)/man/passwd.5.xml \
+ $(top_srcdir)/man/porttime.5.xml \
+ $(top_srcdir)/man/pwck.8.xml \
+ $(top_srcdir)/man/pwconv.8.xml \
+ $(top_srcdir)/man/shadow.3.xml \
+ $(top_srcdir)/man/shadow.5.xml \
+ $(top_srcdir)/man/sg.1.xml \
+ $(top_srcdir)/man/su.1.xml \
+ $(top_srcdir)/man/suauth.5.xml \
+ $(top_srcdir)/man/useradd.8.xml \
+ $(top_srcdir)/man/userdel.8.xml \
+ $(top_srcdir)/man/usermod.8.xml \
+ $(top_srcdir)/man/vipw.8.xml
+