diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2018-02-20 02:13:41 +0000 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2018-02-20 02:13:41 +0000 |
| commit | 81dbbcb1c3eff8a8968227641ae8aaacff447f35 (patch) | |
| tree | d91217606d704bd21e27182f281fe4c94c3bd70f | |
| parent | f498a252d549aec6eb894a6355c451f52e2eb632 (diff) | |
| download | lynx-snapshots-81dbbcb1c3eff8a8968227641ae8aaacff447f35.tar.gz | |
snapshot of project "lynx", label v2-8-9dev_16g
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | po/makefile.inn | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/CHANGES b/CHANGES index 97ff8457..1a27607f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,11 @@ --- $LynxId: CHANGES,v 1.927 2018/02/20 00:44:42 tom Exp $ +-- $LynxId: CHANGES,v 1.928 2018/02/20 02:04:01 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== 2018-02-19 (2.8.9dev.17) +* modify po/makefile.inn to ensure the temporary files have distinct names + to avoid problem with "make -j8" (Debian #890811). * update makefile/batch-scripts to allow building with newer Visual Studio versions, e.g., 2010, 2012, so that a 64-bit executable can be built -TD * repair link in lynx_help_main.html to HTML 3.2 documentation diff --git a/po/makefile.inn b/po/makefile.inn index fc53c523..7515cb96 100644 --- a/po/makefile.inn +++ b/po/makefile.inn @@ -1,4 +1,4 @@ -# $LynxId: makefile.inn,v 1.28 2017/07/08 19:04:06 tom Exp $ +# $LynxId: makefile.inn,v 1.31 2018/02/20 02:13:41 tom Exp $ # # Makefile for program source directory in GNU NLS utilities package. # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> @@ -89,23 +89,22 @@ INSTOBJ = $(NLS_TEXTDOMAIN)$(INSTOBJEXT) @echo "translating $< to $@" @$(SHELL) -c 'LC_ALL=C \ sed -e s,http://lynx.browser.org/,@HOMEPAGE_URL@,g \ - -e s,http://lynx.isc.org/,@HOMEPAGE_URL@,g $< >pass1.tmp;\ - if cmp -s $< pass1.tmp; \ + -e s,http://lynx.isc.org/,@HOMEPAGE_URL@,g $< >pass1-$(*F).tmp;\ + if cmp -s $< pass1-$(*F).tmp; \ then \ echo ...no change made to homepage URL; \ else \ echo ...updated homepage URL;\ fi; \ - if $(MSGMERGE) -w 132 pass1.tmp $(srcdir)/$(PACKAGE).pot -o pass2.tmp; \ + if $(MSGMERGE) -w 132 pass1-$(*F).tmp $(srcdir)/$(PACKAGE).pot -o pass2-$(*F).tmp; \ then \ echo "...merged against $(srcdir)/$(PACKAGE).pot";\ else \ echo "...workaround without merging against $(srcdir)/$(PACKAGE).pot";\ - cat $< >pass2.tmp; \ + cat $< >pass2-$(*F).tmp; \ fi ' - @ECHO_CC@file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file pass2.tmp - @-rm -f pass*.tmp + @ECHO_CC@rm -f $@ && $(GMSGFMT) -o $@ pass2-$(*F).tmp + @-rm -f pass*-$(*F).tmp .po.cat: @echo "translating $< to $@" |