On 04.05.19 16:15, Tim Rühsen wrote: > Hi Bruno, > > On 04.05.19 14:44, Bruno Haible wrote: >> Hi Tim, >> >>> I am possible at the wrong ML now, but see the braking shell code as >>> well in gnulib/build-aux/po/Makefile.in.in. >> >> CCing bug-gettext, since that is the more appropriate mailing list. >> >>> The make target '$(DOMAIN).pot-update:' contains this code: >>> if test -f $(srcdir)/$(DOMAIN).pot; then \ >>> sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > >>> $(DOMAIN).1po && \ >>> sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ >>> if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ >>> rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ >>> else \ >>> rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ >>> mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ >>> fi; \ >>> else \ >>> mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ >>> fi; \ >>> >>> In a vpath build (using the configure script outside the main project >>> directory), the line >>> rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot >>> is triggered and thus breaks 'make distcheck'. >>> >>> This due to all files in $(srcdir) are read-only. >> >> That piece of Makefile code is careful to not touch $(srcdir)/$(DOMAIN).pot >> if $(DOMAIN).1po $(DOMAIN).2po are the same. They are generated through >> >> sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > >> $(DOMAIN).1po && \ >> sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ >> >> To investigate the cause of this failure, compare the files >> wget.po and $(srcdir)/wget.po. They ought to differ only in the >> POT-Creation-Date >> line. > > That's indeed a good hint... > > $ diff wget.po ../../../po/wget.pot > 3c3 > < # This file is distributed under the same license as the wget package. > --- >> # This file is distributed under the same license as the GNU wget package. > 9c9 > < "Project-Id-Version: wget 1.20.3.13-ee7fe-dirty\n" > --- >> "Project-Id-Version: GNU wget 1.20.3.13-ee7fe-dirty\n" > 11c11 > < "POT-Creation-Date: 2019-05-04 15:31+0200\n" > --- >> "POT-Creation-Date: 2019-05-04 15:29+0200\n" > > Since "GNU" is correct here, I wonder why is vanishes...
Some lines above there is if LC_ALL=C grep 'GNU wget' ../../../* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ package_gnu='GNU '; \ else \ package_gnu=''; \ fi; \ As it turns out: LC_ALL=C grep 'GNU wget' ..../../../* has zero output. Using grep -i then shows several 'GNU Wget' occurrences. In 'configure.ac' we have "AC_INIT([wget]...". I think we'll have to change it to "AC_INIT([Wget]...", hope there are no hidden side effects. Thanks for your help ! Regards, Tim
signature.asc
Description: OpenPGP digital signature