Cleanup previous commit.

diff --git a/man/po/LINGUAS b/man/po/LINGUAS
index 0d7e47736f5919007ebedc47f503f3ef25142d39..bbf84f640a43e7fff1cb6d46b3c37f74d395da3a 100644 (file)
--- a/man/po/LINGUAS
+++ b/man/po/LINGUAS
@@ -1,4 +1,8 @@
+# LINGUAS
+
 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
+
+# These variables are generated based on the LINGUAS list
+POFILES = $(patsubst %,$(srcdir)/%.po,$(LINGUAS))
+UPDATEPOFILES = $(patsubst %,%.po-update,$(LINGUAS))
+DUMMYPOFILES = $(patsubst %,%.nop,$(LINGUAS))

diff --git a/man/po/Makefile.in b/man/po/Makefile.in
index 55f7f52de1858435b95d7e5bfeb7483a1b3612e6..fa54cc141de5dd071de677233dab46873211822a 100644 (file)
--- a/man/po/Makefile.in
+++ b/man/po/Makefile.in
@@ -11,35 +11,33 @@
 # Origin: gettext-0.16
 # Modified to handle translations with xml2po by Nicolas François - 2007
 
-PACKAGE = shadow
-VERSION = 4.1.4.2+svn3283
-PACKAGE_BUGREPORT = 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
 SHELL = /bin/sh
+@SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
 
-srcdir = .
-top_srcdir = ../..
-
-
-MSGFMT_ = /usr/bin/msgfmt
-MSGFMT_no = /usr/bin/msgfmt
-MSGFMT_yes = /usr/bin/msgfmt
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
 MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-XGETTEXT_ = /usr/bin/xgettext
-XGETTEXT_no = /usr/bin/xgettext
-XGETTEXT_yes = /usr/bin/xgettext
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge --previous
-MSGMERGE_UPDATE = /usr/bin/msgmerge --update --previous
+MSGMERGE = @MSGMERGE@ --previous
+MSGMERGE_UPDATE = @MSGMERGE@ --update --previous
 MSGINIT = msginit
 MSGCONV = msgconv
 MSGFILTER = msgfilter
 
 include $(srcdir)/LINGUAS
-#DISTFILES.common = Makefile.in remove-potcdate.sin
-DISTFILES.common = remove-potcdate.sin
-DISTFILES = $(DISTFILES.common) Makevars XMLFILES LINGUAS $(POFILES)
+DISTFILES = $(srcdir)/Makevars $(srcdir)/XMLFILES $(srcdir)/LINGUAS $(POFILES)
 
 include $(srcdir)/XMLFILES
 
@@ -48,14 +46,13 @@ include $(srcdir)/Makevars
 .SUFFIXES:
 .SUFFIXES: .po .sed .sin .nop .po-create .po-update
 
-remove-potcdate.sin: ../../po/remove-potcdate.sin
-       cp ../../po/remove-potcdate.sin .
+remove-potcdate.sin: $(top_srcdir)/po/remove-potcdate.sin
+       cp $? $@
 
 .sin.sed:
        sed -e '/^#/d' $< > t-$@
        mv t-$@ $@
 
-
 all: all-yes
 
 all-yes: stamp-po
@@ -76,6 +73,7 @@ all-no:
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
+       echo "TOTO 0"
        @test ! -f $(srcdir)/$(DOMAIN).pot || { \
          echo "touch stamp-po" && \
          echo timestamp > stamp-poT && \
@@ -152,7 +150,7 @@ check: all
 info dvi ps pdf html tags TAGS ctags CTAGS ID:
 
 mostlyclean:
-       rm -f remove-potcdate.sed
+       rm -f remove-potcdate.sed remove-potcdate.sin
        rm -f stamp-poT
        rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 
@@ -191,8 +189,6 @@ dist2: stamp-po $(DISTFILES)
            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,11 +228,18 @@ update-po: Makefile
 
 $(DUMMYPOFILES):
 
-#Makefile: Makefile.in Makevars $(top_builddir)/config.status LINGUAS
-#      cd $(top_builddir) \
-#        && $(SHELL) ./config.status $(subdir)/$@
-
-force:
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.